diff --git a/src/backend/columnar/Makefile b/src/backend/columnar/Makefile
index abda9c90d..bf17b98bf 100644
--- a/src/backend/columnar/Makefile
+++ b/src/backend/columnar/Makefile
@@ -8,10 +8,22 @@ OBJS += \
 	$(patsubst $(citus_abs_srcdir)/%.c,%.o,$(foreach dir,$(SUBDIRS), $(sort $(wildcard $(citus_abs_srcdir)/$(dir)/*.c))))
 
 MODULE_big = citus_columnar
+EXTENSION = citus_columnar
+
+columnar_sql_files = $(patsubst $(citus_abs_srcdir)/%,%,$(wildcard $(citus_abs_srcdir)/sql/*.sql))
+columnar_downgrade_sql_files = $(patsubst $(citus_abs_srcdir)/%,%,$(wildcard $(citus_abs_srcdir)/sql/downgrades/*.sql))
+DATA = $(columnar_sql_files) \
+		$(columnar_downgrade_sql_files)
 
 PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include
 
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
 include $(citus_top_builddir)/Makefile.global
 
 .PHONY: install-all
 install-all: install
+endif
diff --git a/src/backend/columnar/citus_columnar.control b/src/backend/columnar/citus_columnar.control
new file mode 100644
index 000000000..eaa349136
--- /dev/null
+++ b/src/backend/columnar/citus_columnar.control
@@ -0,0 +1,6 @@
+# Columnar extension
+comment = 'Citus Columnar extension'
+default_version = '11.1-1'
+module_pathname = '$libdir/citus_columnar'
+relocatable = false
+schema = pg_catalog
diff --git a/src/backend/columnar/columnar_tableam.c b/src/backend/columnar/columnar_tableam.c
index ad6689087..333231dec 100644
--- a/src/backend/columnar/columnar_tableam.c
+++ b/src/backend/columnar/columnar_tableam.c
@@ -28,6 +28,7 @@
 #include "catalog/pg_extension.h"
 #include "catalog/storage.h"
 #include "catalog/storage_xlog.h"
+#include "commands/defrem.h"
 #include "commands/progress.h"
 #include "commands/vacuum.h"
 #include "commands/extension.h"
@@ -2363,6 +2364,16 @@ ColumnarProcessUtility(PlannedStmt *pstmt,
 				(errmsg("columnar storage parameters specified on non-columnar table")));
 	}
 
+	if (IsA(parsetree, CreateExtensionStmt))
+	{
+		CheckCitusColumnarCreateExtensionStmt(parsetree);
+	}
+
+	if (IsA(parsetree, AlterExtensionStmt))
+	{
+		CheckCitusColumnarAlterExtensionStmt(parsetree);
+	}
+
 	PrevProcessUtilityHook_compat(pstmt, queryString, false, context,
 								  params, queryEnv, dest, completionTag);
 
@@ -2409,6 +2420,66 @@ IsColumnarTableAmTable(Oid relationId)
 }
 
 
+/*
+ * CheckCitusColumnarCreateExtensionStmt determines whether can install
+ * citus_columnar per given CREATE extension statment
+ */
+void
+CheckCitusColumnarCreateExtensionStmt(Node *parseTree)
+{
+	CreateExtensionStmt *createExtensionStmt = castNode(CreateExtensionStmt,
+														parseTree);
+	if (get_extension_oid("citus_columnar", true) == InvalidOid)
+	{
+		if (strcmp(createExtensionStmt->extname, "citus_columnar") == 0)
+		{
+			DefElem *newVersionValue = GetExtensionOption(
+				createExtensionStmt->options,
+				"new_version");
+
+			/*we are not allowed to install citus_columnar as version 11.1-0 by cx*/
+			if (newVersionValue)
+			{
+				const char *newVersion = defGetString(newVersionValue);
+				if (strcmp(newVersion, CITUS_COLUMNAR_INTERNAL_VERSION) == 0)
+				{
+					ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+									errmsg(
+										"unsupported citus_columnar version 11.1-0")));
+				}
+			}
+		}
+	}
+}
+
+
+/*
+ * CheckCitusColumnarAlterExtensionStmt determines whether can alter
+ * citus_columnar per given ALTER extension statment
+ */
+void
+CheckCitusColumnarAlterExtensionStmt(Node *parseTree)
+{
+	AlterExtensionStmt *alterExtensionStmt = castNode(AlterExtensionStmt, parseTree);
+	if (strcmp(alterExtensionStmt->extname, "citus_columnar") == 0)
+	{
+		DefElem *newVersionValue = GetExtensionOption(alterExtensionStmt->options,
+													  "new_version");
+
+		/*we are not allowed cx to downgrade citus_columnar to 11.1-0*/
+		if (newVersionValue)
+		{
+			const char *newVersion = defGetString(newVersionValue);
+			if (strcmp(newVersion, CITUS_COLUMNAR_INTERNAL_VERSION) == 0)
+			{
+				ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								errmsg("unsupported citus_columnar version 11.1-0")));
+			}
+		}
+	}
+}
+
+
 static const TableAmRoutine columnar_am_methods = {
 	.type = T_TableAmRoutine,
 
@@ -2984,3 +3055,23 @@ InstalledExtensionVersionColumnar(void)
 
 	return installedExtensionVersion;
 }
+
+
+/*
+ * GetExtensionOption returns DefElem * node with "defname" from "options" list
+ */
+DefElem *
+GetExtensionOption(List *extensionOptions, const char *defname)
+{
+	DefElem *defElement = NULL;
+	foreach_ptr(defElement, extensionOptions)
+	{
+		if (IsA(defElement, DefElem) &&
+			strncmp(defElement->defname, defname, NAMEDATALEN) == 0)
+		{
+			return defElement;
+		}
+	}
+
+	return NULL;
+}
diff --git a/src/backend/columnar/sql/citus_columnar--11.1-0--11.1-1.sql b/src/backend/columnar/sql/citus_columnar--11.1-0--11.1-1.sql
new file mode 100644
index 000000000..f7d318ae9
--- /dev/null
+++ b/src/backend/columnar/sql/citus_columnar--11.1-0--11.1-1.sql
@@ -0,0 +1,32 @@
+-- add columnar objects back
+ALTER EXTENSION citus_columnar ADD SCHEMA columnar;
+ALTER EXTENSION citus_columnar ADD SCHEMA columnar_internal;
+ALTER EXTENSION citus_columnar ADD SEQUENCE columnar_internal.storageid_seq;
+ALTER EXTENSION citus_columnar ADD TABLE columnar_internal.options;
+ALTER EXTENSION citus_columnar ADD TABLE columnar_internal.stripe;
+ALTER EXTENSION citus_columnar ADD TABLE columnar_internal.chunk_group;
+ALTER EXTENSION citus_columnar ADD TABLE columnar_internal.chunk;
+
+ALTER EXTENSION citus_columnar ADD FUNCTION columnar_internal.columnar_handler;
+ALTER EXTENSION citus_columnar ADD ACCESS METHOD columnar;
+ALTER EXTENSION citus_columnar ADD FUNCTION pg_catalog.alter_columnar_table_set;
+ALTER EXTENSION citus_columnar ADD FUNCTION pg_catalog.alter_columnar_table_reset;
+
+ALTER EXTENSION citus_columnar ADD FUNCTION citus_internal.upgrade_columnar_storage;
+ALTER EXTENSION citus_columnar ADD FUNCTION citus_internal.downgrade_columnar_storage;
+ALTER EXTENSION citus_columnar ADD FUNCTION citus_internal.columnar_ensure_am_depends_catalog;
+
+ALTER EXTENSION citus_columnar ADD FUNCTION columnar.get_storage_id;
+ALTER EXTENSION citus_columnar ADD VIEW columnar.storage;
+ALTER EXTENSION citus_columnar ADD VIEW columnar.options;
+ALTER EXTENSION citus_columnar ADD VIEW columnar.stripe;
+ALTER EXTENSION citus_columnar ADD VIEW columnar.chunk_group;
+ALTER EXTENSION citus_columnar ADD VIEW columnar.chunk;
+
+-- move citus_internal functions to columnar_internal
+
+ALTER FUNCTION citus_internal.upgrade_columnar_storage(regclass) SET SCHEMA columnar_internal;
+ALTER FUNCTION citus_internal.downgrade_columnar_storage(regclass) SET SCHEMA columnar_internal;
+ALTER FUNCTION citus_internal.columnar_ensure_am_depends_catalog() SET SCHEMA columnar_internal;
+
+
diff --git a/src/backend/columnar/sql/citus_columnar--11.1-0.sql b/src/backend/columnar/sql/citus_columnar--11.1-0.sql
new file mode 100644
index 000000000..cf39d9c06
--- /dev/null
+++ b/src/backend/columnar/sql/citus_columnar--11.1-0.sql
@@ -0,0 +1 @@
+-- fake sql file 'Y'
diff --git a/src/backend/columnar/sql/citus_columnar--11.1-1.sql b/src/backend/columnar/sql/citus_columnar--11.1-1.sql
new file mode 100644
index 000000000..c1081aba2
--- /dev/null
+++ b/src/backend/columnar/sql/citus_columnar--11.1-1.sql
@@ -0,0 +1,435 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION citus_columnar" to load this file. \quit
+
+-- columnar--9.5-1--10.0-1.sql
+
+CREATE SCHEMA IF NOT EXISTS columnar;
+SET search_path TO columnar;
+
+
+CREATE SEQUENCE IF NOT EXISTS storageid_seq MINVALUE 10000000000 NO CYCLE;
+
+CREATE TABLE IF NOT EXISTS options (
+    regclass regclass NOT NULL PRIMARY KEY,
+    chunk_group_row_limit int NOT NULL,
+    stripe_row_limit int NOT NULL,
+    compression_level int NOT NULL,
+    compression name NOT NULL
+) WITH (user_catalog_table = true);
+
+COMMENT ON TABLE options IS 'columnar table specific options, maintained by alter_columnar_table_set';
+
+CREATE TABLE IF NOT EXISTS stripe (
+    storage_id bigint NOT NULL,
+    stripe_num bigint NOT NULL,
+    file_offset bigint NOT NULL,
+    data_length bigint NOT NULL,
+    column_count int NOT NULL,
+    chunk_row_count int NOT NULL,
+    row_count bigint NOT NULL,
+    chunk_group_count int NOT NULL,
+    first_row_number bigint NOT NULL,
+    PRIMARY KEY (storage_id, stripe_num),
+    CONSTRAINT stripe_first_row_number_idx UNIQUE (storage_id, first_row_number)
+) WITH (user_catalog_table = true);
+
+COMMENT ON TABLE stripe IS 'Columnar per stripe metadata';
+
+CREATE TABLE IF NOT EXISTS chunk_group (
+    storage_id bigint NOT NULL,
+    stripe_num bigint NOT NULL,
+    chunk_group_num int NOT NULL,
+    row_count bigint NOT NULL,
+    PRIMARY KEY (storage_id, stripe_num, chunk_group_num)
+);
+
+COMMENT ON TABLE chunk_group IS 'Columnar chunk group metadata';
+
+CREATE TABLE IF NOT EXISTS chunk (
+    storage_id bigint NOT NULL,
+    stripe_num bigint NOT NULL,
+    attr_num int NOT NULL,
+    chunk_group_num int NOT NULL,
+    minimum_value bytea,
+    maximum_value bytea,
+    value_stream_offset bigint NOT NULL,
+    value_stream_length bigint NOT NULL,
+    exists_stream_offset bigint NOT NULL,
+    exists_stream_length bigint NOT NULL,
+    value_compression_type int NOT NULL,
+    value_compression_level int NOT NULL,
+    value_decompressed_length bigint NOT NULL,
+    value_count bigint NOT NULL,
+    PRIMARY KEY (storage_id, stripe_num, attr_num, chunk_group_num)
+) WITH (user_catalog_table = true);
+
+COMMENT ON TABLE chunk IS 'Columnar per chunk metadata';
+
+DO $proc$
+BEGIN
+
+-- from version 12 and up we have support for tableam's if installed on pg11 we can't
+-- create the objects here. Instead we rely on citus_finish_pg_upgrade to be called by the
+-- user instead to add the missing objects
+IF substring(current_Setting('server_version'), '\d+')::int >= 12 THEN
+  EXECUTE $$
+--#include "udfs/columnar_handler/10.0-1.sql"
+CREATE OR REPLACE FUNCTION columnar.columnar_handler(internal)
+    RETURNS table_am_handler
+    LANGUAGE C
+AS 'MODULE_PATHNAME', 'columnar_handler';
+COMMENT ON FUNCTION columnar.columnar_handler(internal)
+    IS 'internal function returning the handler for columnar tables';
+
+-- postgres 11.8 does not support the syntax for table am, also it is seemingly trying
+-- to parse the upgrade file and erroring on unknown syntax.
+-- normally this section would not execute on postgres 11 anyway. To trick it to pass on
+-- 11.8 we wrap the statement in a plpgsql block together with an EXECUTE. This is valid
+-- syntax on 11.8 and will execute correctly in 12
+DO $create_table_am$
+BEGIN
+  EXECUTE 'CREATE ACCESS METHOD columnar TYPE TABLE HANDLER columnar.columnar_handler';
+END $create_table_am$;
+
+--#include "udfs/alter_columnar_table_set/10.0-1.sql"
+CREATE OR REPLACE FUNCTION pg_catalog.alter_columnar_table_set(
+    table_name regclass,
+    chunk_group_row_limit int DEFAULT NULL,
+    stripe_row_limit int DEFAULT NULL,
+    compression name DEFAULT null,
+    compression_level int DEFAULT NULL)
+    RETURNS void
+    LANGUAGE C
+AS 'MODULE_PATHNAME', 'alter_columnar_table_set';
+
+COMMENT ON FUNCTION pg_catalog.alter_columnar_table_set(
+    table_name regclass,
+    chunk_group_row_limit int,
+    stripe_row_limit int,
+    compression name,
+    compression_level int)
+IS 'set one or more options on a columnar table, when set to NULL no change is made';
+
+
+--#include "udfs/alter_columnar_table_reset/10.0-1.sql"
+CREATE OR REPLACE FUNCTION pg_catalog.alter_columnar_table_reset(
+    table_name regclass,
+    chunk_group_row_limit bool DEFAULT false,
+    stripe_row_limit bool DEFAULT false,
+    compression bool DEFAULT false,
+    compression_level bool DEFAULT false)
+    RETURNS void
+    LANGUAGE C
+AS 'MODULE_PATHNAME', 'alter_columnar_table_reset';
+
+COMMENT ON FUNCTION pg_catalog.alter_columnar_table_reset(
+    table_name regclass,
+    chunk_group_row_limit bool,
+    stripe_row_limit bool,
+    compression bool,
+    compression_level bool)
+IS 'reset on or more options on a columnar table to the system defaults';
+
+  $$;
+END IF;
+END$proc$;
+
+-- (this function being dropped in 10.0.3)->#include "udfs/columnar_ensure_objects_exist/10.0-1.sql"
+
+RESET search_path;
+
+-- columnar--10.0.-1 --10.0.2
+GRANT USAGE ON SCHEMA columnar TO PUBLIC;
+GRANT SELECT ON ALL tables IN SCHEMA columnar TO PUBLIC ;
+
+-- columnar--10.0-3--10.1-1.sql
+
+-- Drop foreign keys between columnar metadata tables.
+
+
+-- columnar--10.1-1--10.2-1.sql
+
+-- For a proper mapping between tid & (stripe, row_num), add a new column to
+-- columnar.stripe and define a BTREE index on this column.
+-- Also include storage_id column for per-relation scans.
+
+
+-- Populate first_row_number column of columnar.stripe table.
+--
+-- For simplicity, we calculate MAX(row_count) value across all the stripes
+-- of all the columanar tables and then use it to populate first_row_number
+-- column. This would introduce some gaps however we are okay with that since
+-- it's already the case with regular INSERT/COPY's.
+DO $$
+DECLARE
+  max_row_count bigint;
+  -- this should be equal to columnar_storage.h/COLUMNAR_FIRST_ROW_NUMBER
+  COLUMNAR_FIRST_ROW_NUMBER constant bigint := 1;
+BEGIN
+  SELECT MAX(row_count) INTO max_row_count FROM columnar.stripe;
+  UPDATE columnar.stripe SET first_row_number = COLUMNAR_FIRST_ROW_NUMBER +
+                                                (stripe_num - 1) * max_row_count;
+END;
+$$;
+
+-- columnar--10.2-1--10.2-2.sql
+
+-- revoke read access for columnar.chunk from unprivileged
+-- user as it contains chunk min/max values
+REVOKE SELECT ON columnar.chunk FROM PUBLIC;
+
+
+-- columnar--10.2-2--10.2-3.sql
+
+-- Since stripe_first_row_number_idx is required to scan a columnar table, we
+-- need to make sure that it is created before doing anything with columnar
+-- tables during pg upgrades.
+--
+-- However, a plain btree index is not a dependency of a table, so pg_upgrade
+-- cannot guarantee that stripe_first_row_number_idx gets created when
+-- creating columnar.stripe, unless we make it a unique "constraint".
+--
+-- To do that, drop stripe_first_row_number_idx and create a unique
+-- constraint with the same name to keep the code change at minimum.
+
+-- columnar--10.2-3--10.2-4.sql
+
+
+-- columnar--11.0-2--11.1-1.sql
+
+CREATE OR REPLACE FUNCTION pg_catalog.alter_columnar_table_set(
+    table_name regclass,
+    chunk_group_row_limit int DEFAULT NULL,
+    stripe_row_limit int DEFAULT NULL,
+    compression name DEFAULT null,
+    compression_level int DEFAULT NULL)
+    RETURNS void
+    LANGUAGE plpgsql AS
+$alter_columnar_table_set$
+declare
+  noop BOOLEAN := true;
+  cmd  TEXT    := 'ALTER TABLE ' || table_name::text || ' SET (';
+begin
+  if (chunk_group_row_limit is not null) then
+    if (not noop) then cmd := cmd || ', '; end if;
+    cmd := cmd  || 'columnar.chunk_group_row_limit=' || chunk_group_row_limit;
+    noop := false;
+  end if;
+  if (stripe_row_limit is not null) then
+    if (not noop) then cmd := cmd || ', '; end if;
+    cmd := cmd || 'columnar.stripe_row_limit=' || stripe_row_limit;
+    noop := false;
+  end if;
+  if (compression is not null) then
+    if (not noop) then cmd := cmd || ', '; end if;
+    cmd := cmd || 'columnar.compression=' || compression;
+    noop := false;
+  end if;
+  if (compression_level is not null) then
+    if (not noop) then cmd := cmd || ', '; end if;
+    cmd := cmd || 'columnar.compression_level=' || compression_level;
+    noop := false;
+  end if;
+  cmd := cmd || ')';
+  if (not noop) then
+    execute cmd;
+  end if;
+  return;
+end;
+$alter_columnar_table_set$;
+
+COMMENT ON FUNCTION pg_catalog.alter_columnar_table_set(
+    table_name regclass,
+    chunk_group_row_limit int,
+    stripe_row_limit int,
+    compression name,
+    compression_level int)
+IS 'set one or more options on a columnar table, when set to NULL no change is made';
+
+CREATE OR REPLACE FUNCTION pg_catalog.alter_columnar_table_reset(
+    table_name regclass,
+    chunk_group_row_limit bool DEFAULT false,
+    stripe_row_limit bool DEFAULT false,
+    compression bool DEFAULT false,
+    compression_level bool DEFAULT false)
+    RETURNS void
+    LANGUAGE plpgsql AS
+$alter_columnar_table_reset$
+declare
+  noop BOOLEAN := true;
+  cmd  TEXT    := 'ALTER TABLE ' || table_name::text || ' RESET (';
+begin
+  if (chunk_group_row_limit) then
+    if (not noop) then cmd := cmd || ', '; end if;
+    cmd := cmd   || 'columnar.chunk_group_row_limit';
+    noop := false;
+  end if;
+  if (stripe_row_limit) then
+    if (not noop) then cmd := cmd || ', '; end if;
+    cmd := cmd || 'columnar.stripe_row_limit';
+    noop := false;
+  end if;
+  if (compression) then
+    if (not noop) then cmd := cmd || ', '; end if;
+    cmd := cmd || 'columnar.compression';
+    noop := false;
+  end if;
+  if (compression_level) then
+    if (not noop) then cmd := cmd || ', '; end if;
+    cmd := cmd || 'columnar.compression_level';
+    noop := false;
+  end if;
+  cmd := cmd || ')';
+  if (not noop) then
+    execute cmd;
+  end if;
+  return;
+end;
+$alter_columnar_table_reset$;
+
+COMMENT ON FUNCTION pg_catalog.alter_columnar_table_reset(
+    table_name regclass,
+    chunk_group_row_limit bool,
+    stripe_row_limit bool,
+    compression bool,
+    compression_level bool)
+IS 'reset on or more options on a columnar table to the system defaults';
+
+-- rename columnar schema to columnar_internal and tighten security
+
+REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA columnar FROM PUBLIC;
+ALTER SCHEMA columnar RENAME TO columnar_internal;
+REVOKE ALL PRIVILEGES ON SCHEMA columnar_internal FROM PUBLIC;
+
+-- create columnar schema with public usage privileges
+
+CREATE SCHEMA columnar;
+GRANT USAGE ON SCHEMA columnar TO PUBLIC;
+
+--#include "udfs/upgrade_columnar_storage/10.2-1.sql"
+CREATE OR REPLACE FUNCTION columnar_internal.upgrade_columnar_storage(rel regclass)
+  RETURNS VOID
+  STRICT
+  LANGUAGE c AS 'MODULE_PATHNAME', $$upgrade_columnar_storage$$;
+
+COMMENT ON FUNCTION columnar_internal.upgrade_columnar_storage(regclass)
+  IS 'function to upgrade the columnar storage, if necessary';
+
+
+--#include "udfs/downgrade_columnar_storage/10.2-1.sql"
+
+CREATE OR REPLACE FUNCTION columnar_internal.downgrade_columnar_storage(rel regclass)
+  RETURNS VOID
+  STRICT
+  LANGUAGE c AS 'MODULE_PATHNAME', $$downgrade_columnar_storage$$;
+
+COMMENT ON FUNCTION columnar_internal.downgrade_columnar_storage(regclass)
+  IS 'function to downgrade the columnar storage, if necessary';
+
+-- update UDF to account for columnar_internal schema
+CREATE OR REPLACE FUNCTION columnar_internal.columnar_ensure_am_depends_catalog()
+  RETURNS void
+  LANGUAGE plpgsql
+  SET search_path = pg_catalog
+AS $func$
+BEGIN
+  INSERT INTO pg_depend
+  WITH columnar_schema_members(relid) AS (
+    SELECT pg_class.oid AS relid FROM pg_class
+      WHERE relnamespace =
+            COALESCE(
+	       (SELECT pg_namespace.oid FROM pg_namespace WHERE nspname = 'columnar_internal'),
+	       (SELECT pg_namespace.oid FROM pg_namespace WHERE nspname = 'columnar')
+	    )
+        AND relname IN ('chunk',
+                        'chunk_group',
+                        'chunk_group_pkey',
+                        'chunk_pkey',
+                        'options',
+                        'options_pkey',
+                        'storageid_seq',
+                        'stripe',
+                        'stripe_first_row_number_idx',
+                        'stripe_pkey')
+  )
+  SELECT -- Define a dependency edge from "columnar table access method" ..
+         'pg_am'::regclass::oid as classid,
+         (select oid from pg_am where amname = 'columnar') as objid,
+         0 as objsubid,
+         -- ... to each object that is registered to pg_class and that lives
+         -- in "columnar" schema. That contains catalog tables, indexes
+         -- created on them and the sequences created in "columnar" schema.
+         --
+         -- Given the possibility of user might have created their own objects
+         -- in columnar schema, we explicitly specify list of objects that we
+         -- are interested in.
+         'pg_class'::regclass::oid as refclassid,
+         columnar_schema_members.relid as refobjid,
+         0 as refobjsubid,
+         'n' as deptype
+  FROM columnar_schema_members
+  -- Avoid inserting duplicate entries into pg_depend.
+  EXCEPT TABLE pg_depend;
+END;
+$func$;
+COMMENT ON FUNCTION columnar_internal.columnar_ensure_am_depends_catalog()
+  IS 'internal function responsible for creating dependencies from columnar '
+     'table access method to the rel objects in columnar schema';
+
+SELECT columnar_internal.columnar_ensure_am_depends_catalog();
+
+-- add utility function
+
+CREATE FUNCTION columnar.get_storage_id(regclass) RETURNS bigint
+    LANGUAGE C STRICT
+    AS 'citus_columnar', $$columnar_relation_storageid$$;
+
+-- create views for columnar table information
+
+CREATE VIEW columnar.storage WITH (security_barrier) AS
+  SELECT c.oid::regclass AS relation,
+         columnar.get_storage_id(c.oid) AS storage_id
+    FROM pg_class c, pg_am am
+    WHERE c.relam = am.oid AND am.amname = 'columnar'
+      AND pg_has_role(c.relowner, 'USAGE');
+COMMENT ON VIEW columnar.storage IS 'Columnar relation ID to storage ID mapping.';
+GRANT SELECT ON columnar.storage TO PUBLIC;
+
+CREATE VIEW columnar.options WITH (security_barrier) AS
+  SELECT regclass AS relation, chunk_group_row_limit,
+         stripe_row_limit, compression, compression_level
+    FROM columnar_internal.options o, pg_class c
+    WHERE o.regclass = c.oid
+      AND pg_has_role(c.relowner, 'USAGE');
+COMMENT ON VIEW columnar.options
+  IS 'Columnar options for tables on which the current user has ownership privileges.';
+GRANT SELECT ON columnar.options TO PUBLIC;
+
+CREATE VIEW columnar.stripe WITH (security_barrier) AS
+  SELECT relation, storage.storage_id, stripe_num, file_offset, data_length,
+         column_count, chunk_row_count, row_count, chunk_group_count, first_row_number
+    FROM columnar_internal.stripe stripe, columnar.storage storage
+    WHERE stripe.storage_id = storage.storage_id;
+COMMENT ON VIEW columnar.stripe
+  IS 'Columnar stripe information for tables on which the current user has ownership privileges.';
+GRANT SELECT ON columnar.stripe TO PUBLIC;
+
+CREATE VIEW columnar.chunk_group WITH (security_barrier) AS
+  SELECT relation, storage.storage_id, stripe_num, chunk_group_num, row_count
+    FROM columnar_internal.chunk_group cg, columnar.storage storage
+    WHERE cg.storage_id = storage.storage_id;
+COMMENT ON VIEW columnar.chunk_group
+  IS 'Columnar chunk group information for tables on which the current user has ownership privileges.';
+GRANT SELECT ON columnar.chunk_group TO PUBLIC;
+
+CREATE VIEW columnar.chunk WITH (security_barrier) AS
+  SELECT relation, storage.storage_id, stripe_num, attr_num, chunk_group_num,
+         minimum_value, maximum_value, value_stream_offset, value_stream_length,
+         exists_stream_offset, exists_stream_length, value_compression_type,
+         value_compression_level, value_decompressed_length, value_count
+    FROM columnar_internal.chunk chunk, columnar.storage storage
+    WHERE chunk.storage_id = storage.storage_id;
+COMMENT ON VIEW columnar.chunk
+  IS 'Columnar chunk information for tables on which the current user has ownership privileges.';
+GRANT SELECT ON columnar.chunk TO PUBLIC;
+
diff --git a/src/backend/columnar/sql/columnar--10.1-1--10.2-1.sql b/src/backend/columnar/sql/columnar--10.1-1--10.2-1.sql
index 1ee471117..4334a7a45 100644
--- a/src/backend/columnar/sql/columnar--10.1-1--10.2-1.sql
+++ b/src/backend/columnar/sql/columnar--10.1-1--10.2-1.sql
@@ -28,5 +28,5 @@ $$;
 #include "udfs/downgrade_columnar_storage/10.2-1.sql"
 
 -- upgrade storage for all columnar relations
-SELECT citus_internal.upgrade_columnar_storage(c.oid) FROM pg_class c, pg_am a
+PERFORM citus_internal.upgrade_columnar_storage(c.oid) FROM pg_class c, pg_am a
   WHERE c.relam = a.oid AND amname = 'columnar';
diff --git a/src/backend/columnar/sql/columnar--10.2-3--10.2-4.sql b/src/backend/columnar/sql/columnar--10.2-3--10.2-4.sql
index b4600a4bf..bdd8fb0c7 100644
--- a/src/backend/columnar/sql/columnar--10.2-3--10.2-4.sql
+++ b/src/backend/columnar/sql/columnar--10.2-3--10.2-4.sql
@@ -2,4 +2,4 @@
 
 #include "udfs/columnar_ensure_am_depends_catalog/10.2-4.sql"
 
-SELECT citus_internal.columnar_ensure_am_depends_catalog();
+PERFORM citus_internal.columnar_ensure_am_depends_catalog();
diff --git a/src/backend/columnar/sql/downgrades/citus_columnar--11.1-1--11.1-0.sql b/src/backend/columnar/sql/downgrades/citus_columnar--11.1-1--11.1-0.sql
new file mode 100644
index 000000000..cd454a2e5
--- /dev/null
+++ b/src/backend/columnar/sql/downgrades/citus_columnar--11.1-1--11.1-0.sql
@@ -0,0 +1,116 @@
+CREATE OR REPLACE FUNCTION pg_catalog.alter_columnar_table_set(
+    table_name regclass,
+    chunk_group_row_limit int DEFAULT NULL,
+    stripe_row_limit int DEFAULT NULL,
+    compression name DEFAULT null,
+    compression_level int DEFAULT NULL)
+    RETURNS void
+    LANGUAGE C
+AS 'MODULE_PATHNAME', 'alter_columnar_table_set';
+
+COMMENT ON FUNCTION pg_catalog.alter_columnar_table_set(
+    table_name regclass,
+    chunk_group_row_limit int,
+    stripe_row_limit int,
+    compression name,
+    compression_level int)
+IS 'set one or more options on a columnar table, when set to NULL no change is made';
+CREATE OR REPLACE FUNCTION pg_catalog.alter_columnar_table_reset(
+    table_name regclass,
+    chunk_group_row_limit bool DEFAULT false,
+    stripe_row_limit bool DEFAULT false,
+    compression bool DEFAULT false,
+    compression_level bool DEFAULT false)
+    RETURNS void
+    LANGUAGE C
+AS 'MODULE_PATHNAME', 'alter_columnar_table_reset';
+
+COMMENT ON FUNCTION pg_catalog.alter_columnar_table_reset(
+    table_name regclass,
+    chunk_group_row_limit bool,
+    stripe_row_limit bool,
+    compression bool,
+    compression_level bool)
+IS 'reset on or more options on a columnar table to the system defaults';
+
+CREATE OR REPLACE FUNCTION columnar_internal.columnar_ensure_am_depends_catalog()
+  RETURNS void
+  LANGUAGE plpgsql
+  SET search_path = pg_catalog
+AS $func$
+BEGIN
+  INSERT INTO pg_depend
+  SELECT -- Define a dependency edge from "columnar table access method" ..
+         'pg_am'::regclass::oid as classid,
+         (select oid from pg_am where amname = 'columnar') as objid,
+         0 as objsubid,
+         -- ... to each object that is registered to pg_class and that lives
+         -- in "columnar" schema. That contains catalog tables, indexes
+         -- created on them and the sequences created in "columnar" schema.
+         --
+         -- Given the possibility of user might have created their own objects
+         -- in columnar schema, we explicitly specify list of objects that we
+         -- are interested in.
+         'pg_class'::regclass::oid as refclassid,
+         columnar_schema_members.relname::regclass::oid as refobjid,
+         0 as refobjsubid,
+         'n' as deptype
+  FROM (VALUES ('columnar.chunk'),
+               ('columnar.chunk_group'),
+               ('columnar.chunk_group_pkey'),
+               ('columnar.chunk_pkey'),
+               ('columnar.options'),
+               ('columnar.options_pkey'),
+               ('columnar.storageid_seq'),
+               ('columnar.stripe'),
+               ('columnar.stripe_first_row_number_idx'),
+               ('columnar.stripe_pkey')
+       ) columnar_schema_members(relname)
+  -- Avoid inserting duplicate entries into pg_depend.
+  EXCEPT TABLE pg_depend;
+END;
+$func$;
+COMMENT ON FUNCTION columnar_internal.columnar_ensure_am_depends_catalog()
+  IS 'internal function responsible for creating dependencies from columnar '
+     'table access method to the rel objects in columnar schema';
+
+DROP VIEW columnar.options;
+DROP VIEW columnar.stripe;
+DROP VIEW columnar.chunk_group;
+DROP VIEW columnar.chunk;
+DROP VIEW columnar.storage;
+DROP FUNCTION columnar.get_storage_id(regclass);
+
+DROP SCHEMA columnar;
+
+-- move columnar_internal functions back to citus_internal
+
+ALTER FUNCTION columnar_internal.upgrade_columnar_storage(regclass) SET SCHEMA citus_internal;
+ALTER FUNCTION columnar_internal.downgrade_columnar_storage(regclass) SET SCHEMA citus_internal;
+ALTER FUNCTION columnar_internal.columnar_ensure_am_depends_catalog() SET SCHEMA citus_internal;
+
+ALTER SCHEMA columnar_internal RENAME TO columnar;
+GRANT USAGE ON SCHEMA columnar TO PUBLIC;
+GRANT SELECT ON columnar.options TO PUBLIC;
+GRANT SELECT ON columnar.stripe TO PUBLIC;
+GRANT SELECT ON columnar.chunk_group TO PUBLIC;
+
+-- detach relations from citus_columnar
+
+ALTER EXTENSION citus_columnar DROP SCHEMA columnar;
+ALTER EXTENSION citus_columnar DROP SEQUENCE columnar.storageid_seq;
+-- columnar tables
+ALTER EXTENSION citus_columnar DROP TABLE columnar.options;
+ALTER EXTENSION citus_columnar DROP TABLE columnar.stripe;
+ALTER EXTENSION citus_columnar DROP TABLE columnar.chunk_group;
+ALTER EXTENSION citus_columnar DROP TABLE columnar.chunk;
+
+ALTER EXTENSION citus_columnar DROP FUNCTION columnar.columnar_handler;
+ALTER EXTENSION citus_columnar DROP ACCESS METHOD columnar;
+ALTER EXTENSION citus_columnar DROP FUNCTION pg_catalog.alter_columnar_table_set;
+ALTER EXTENSION citus_columnar DROP FUNCTION pg_catalog.alter_columnar_table_reset;
+
+-- functions under citus_internal for columnar
+ALTER EXTENSION citus_columnar DROP FUNCTION citus_internal.upgrade_columnar_storage;
+ALTER EXTENSION citus_columnar DROP FUNCTION citus_internal.downgrade_columnar_storage;
+ALTER EXTENSION citus_columnar DROP FUNCTION citus_internal.columnar_ensure_am_depends_catalog;
diff --git a/src/backend/distributed/citus--11.1-1.control b/src/backend/distributed/citus--11.1-1.control
new file mode 100644
index 000000000..93c69fc63
--- /dev/null
+++ b/src/backend/distributed/citus--11.1-1.control
@@ -0,0 +1 @@
+requires = 'citus_columnar'
diff --git a/src/backend/distributed/commands/extension.c b/src/backend/distributed/commands/extension.c
index f18671c75..6f45cec5b 100644
--- a/src/backend/distributed/commands/extension.c
+++ b/src/backend/distributed/commands/extension.c
@@ -11,10 +11,12 @@
 #include "postgres.h"
 
 #include "access/genam.h"
+#include "access/xact.h"
 #include "citus_version.h"
 #include "catalog/dependency.h"
 #include "catalog/pg_depend.h"
 #include "catalog/pg_extension_d.h"
+#include "columnar/columnar.h"
 #include "catalog/pg_foreign_data_wrapper.h"
 #include "commands/defrem.h"
 #include "commands/extension.h"
@@ -745,6 +747,60 @@ IsCreateAlterExtensionUpdateCitusStmt(Node *parseTree)
 }
 
 
+/*
+ * PreProcessCreateExtensionCitusStmtForColumnar determines whether need to
+ * install citus_columnar first or citus_columnar is supported on current
+ * citus version, when a given utility is a CREATE statement
+ */
+void
+PreprocessCreateExtensionStmtForCitusColumnar(Node *parsetree)
+{
+	/*CREATE EXTENSION CITUS (version Z) */
+	CreateExtensionStmt *createExtensionStmt = castNode(CreateExtensionStmt,
+														parsetree);
+
+	if (strcmp(createExtensionStmt->extname, "citus") == 0)
+	{
+		int versionNumber = (int) (100 * strtod(CITUS_MAJORVERSION, NULL));
+		DefElem *newVersionValue = GetExtensionOption(createExtensionStmt->options,
+													  "new_version");
+
+		/*create extension citus version xxx*/
+		if (newVersionValue)
+		{
+			char *newVersion = strdup(defGetString(newVersionValue));
+			versionNumber = GetExtensionVersionNumber(newVersion);
+		}
+
+		/*citus version >= 11.1 requires install citus_columnar first*/
+		if (versionNumber >= 1110)
+		{
+			if (get_extension_oid("citus_columnar", true) == InvalidOid)
+			{
+				CreateExtensionWithVersion("citus_columnar", NULL);
+			}
+		}
+	}
+
+	/*Edge case check: citus_columnar are supported on citus version >= 11.1*/
+	if (strcmp(createExtensionStmt->extname, "citus_columnar") == 0)
+	{
+		Oid citusOid = get_extension_oid("citus", true);
+		if (citusOid != InvalidOid)
+		{
+			char *curCitusVersion = strdup(get_extension_version(citusOid));
+			int curCitusVersionNum = GetExtensionVersionNumber(curCitusVersion);
+			if (curCitusVersionNum < 1110)
+			{
+				ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								errmsg(
+									"must upgrade citus to version 11.1-1 first before install citus_columnar")));
+			}
+		}
+	}
+}
+
+
 /*
  * IsDropCitusExtensionStmt iterates the objects to be dropped in a drop statement
  * and try to find citus extension there.
@@ -812,6 +868,101 @@ IsAlterExtensionSetSchemaCitus(Node *parseTree)
 }
 
 
+/*
+ * PreprocessAlterExtensionCitusStmtForCitusColumnar pre-process the case when upgrade citus
+ * to version that support citus_columnar, or downgrade citus to lower version that
+ * include columnar inside citus extension
+ */
+void
+PreprocessAlterExtensionCitusStmtForCitusColumnar(Node *parseTree)
+{
+	/*upgrade citus: alter extension citus update to 'xxx' */
+	DefElem *newVersionValue = GetExtensionOption(
+		((AlterExtensionStmt *) parseTree)->options, "new_version");
+	Oid citusColumnarOid = get_extension_oid("citus_columnar", true);
+	if (newVersionValue)
+	{
+		char *newVersion = defGetString(newVersionValue);
+		double newVersionNumber = GetExtensionVersionNumber(strdup(newVersion));
+
+		/*alter extension citus update to version >= 11.1-1, and no citus_columnar installed */
+		if (newVersionNumber >= 1110 && citusColumnarOid == InvalidOid)
+		{
+			/*it's upgrade citus to 11.1-1 or further version */
+			CreateExtensionWithVersion("citus_columnar", CITUS_COLUMNAR_INTERNAL_VERSION);
+		}
+		else if (newVersionNumber < 1110 && citusColumnarOid != InvalidOid)
+		{
+			/*downgrade citus, need downgrade citus_columnar to Y */
+			AlterExtensionUpdateStmt("citus_columnar", CITUS_COLUMNAR_INTERNAL_VERSION);
+		}
+	}
+	else
+	{
+		/*alter extension citus update without specifying the version*/
+		int versionNumber = (int) (100 * strtod(CITUS_MAJORVERSION, NULL));
+		if (versionNumber >= 1110)
+		{
+			if (citusColumnarOid == InvalidOid)
+			{
+				CreateExtensionWithVersion("citus_columnar",
+										   CITUS_COLUMNAR_INTERNAL_VERSION);
+			}
+		}
+	}
+}
+
+
+/*
+ * PostprocessAlterExtensionCitusStmtForCitusColumnar process the case when upgrade citus
+ * to version that support citus_columnar, or downgrade citus to lower version that
+ * include columnar inside citus extension
+ */
+void
+PostprocessAlterExtensionCitusStmtForCitusColumnar(Node *parseTree)
+{
+	DefElem *newVersionValue = GetExtensionOption(
+		((AlterExtensionStmt *) parseTree)->options, "new_version");
+	Oid citusColumnarOid = get_extension_oid("citus_columnar", true);
+	if (newVersionValue)
+	{
+		char *newVersion = defGetString(newVersionValue);
+		double newVersionNumber = GetExtensionVersionNumber(strdup(newVersion));
+		if (newVersionNumber >= 1110 && citusColumnarOid != InvalidOid)
+		{
+			/*upgrade citus, after "ALTER EXTENSION citus update to xxx" updates citus_columnar Y to version Z. */
+			char *curColumnarVersion = get_extension_version(citusColumnarOid);
+			if (strcmp(curColumnarVersion, CITUS_COLUMNAR_INTERNAL_VERSION) == 0)
+			{
+				AlterExtensionUpdateStmt("citus_columnar", "11.1-1");
+			}
+		}
+		else if (newVersionNumber < 1110 && citusColumnarOid != InvalidOid)
+		{
+			/*downgrade citus, after "ALTER EXTENSION citus update to xxx" drops citus_columnar extension */
+			char *curColumnarVersion = get_extension_version(citusColumnarOid);
+			if (strcmp(curColumnarVersion, CITUS_COLUMNAR_INTERNAL_VERSION) == 0)
+			{
+				RemoveExtensionById(citusColumnarOid);
+			}
+		}
+	}
+	else
+	{
+		/*alter extension citus update, need upgrade citus_columnar from Y to Z*/
+		int versionNumber = (int) (100 * strtod(CITUS_MAJORVERSION, NULL));
+		if (versionNumber >= 1110)
+		{
+			char *curColumnarVersion = get_extension_version(citusColumnarOid);
+			if (strcmp(curColumnarVersion, CITUS_COLUMNAR_INTERNAL_VERSION) == 0)
+			{
+				AlterExtensionUpdateStmt("citus_columnar", "11.1-1");
+			}
+		}
+	}
+}
+
+
 /*
  * CreateExtensionDDLCommand returns a list of DDL statements (const char *) to be
  * executed on a node to recreate the extension addressed by the extensionAddress.
@@ -1025,3 +1176,80 @@ AlterExtensionUpdateStmtObjectAddress(Node *node, bool missing_ok)
 
 	return address;
 }
+
+
+/*
+ * CreateExtensionWithVersion builds and execute create extension statements
+ * per given extension name and extension verision
+ */
+void
+CreateExtensionWithVersion(char *extname, char *extVersion)
+{
+	CreateExtensionStmt *createExtensionStmt = makeNode(CreateExtensionStmt);
+
+	/* set location to -1 as it is unknown */
+	int location = -1;
+
+	/* set extension name and if_not_exists fields */
+	createExtensionStmt->extname = extname;
+	createExtensionStmt->if_not_exists = true;
+
+	if (extVersion == NULL)
+	{
+		createExtensionStmt->options = NIL;
+	}
+	else
+	{
+		Node *extensionVersionArg = (Node *) makeString(extVersion);
+		DefElem *extensionVersionElement = makeDefElem("new_version", extensionVersionArg,
+													   location);
+		createExtensionStmt->options = lappend(createExtensionStmt->options,
+											   extensionVersionElement);
+	}
+
+	CreateExtension(NULL, createExtensionStmt);
+	CommandCounterIncrement();
+}
+
+
+/*
+ * GetExtensionVersionNumber convert extension version to real value
+ */
+int
+GetExtensionVersionNumber(char *extVersion)
+{
+	char *strtokPosition = NULL;
+	char *versionVal = strtok_r(extVersion, "-", &strtokPosition);
+	double versionNumber = strtod(versionVal, NULL);
+	return (int) (versionNumber * 100);
+}
+
+
+/*
+ * AlterExtensionUpdateStmt builds and execute Alter extension statements
+ * per given extension name and updates extension verision
+ */
+void
+AlterExtensionUpdateStmt(char *extname, char *extVersion)
+{
+	AlterExtensionStmt *alterExtensionStmt = makeNode(AlterExtensionStmt);
+
+	/* set location to -1 as it is unknown */
+	int location = -1;
+	alterExtensionStmt->extname = extname;
+
+	if (extVersion == NULL)
+	{
+		ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT),
+						errmsg("alter extension \"%s\" should not be empty",
+							   extVersion)));
+	}
+
+	Node *extensionVersionArg = (Node *) makeString(extVersion);
+	DefElem *extensionVersionElement = makeDefElem("new_version", extensionVersionArg,
+												   location);
+	alterExtensionStmt->options = lappend(alterExtensionStmt->options,
+										  extensionVersionElement);
+	ExecAlterExtensionStmt(NULL, alterExtensionStmt);
+	CommandCounterIncrement();
+}
diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c
index cb6ab86a3..aae9c6104 100644
--- a/src/backend/distributed/commands/utility_hook.c
+++ b/src/backend/distributed/commands/utility_hook.c
@@ -38,8 +38,10 @@
 #endif
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"
+#include "citus_version.h"
 #include "commands/dbcommands.h"
 #include "commands/defrem.h"
+#include "commands/extension.h"
 #include "commands/tablecmds.h"
 #include "distributed/adaptive_executor.h"
 #include "distributed/backend_data.h"
@@ -74,8 +76,10 @@
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
+#include "nodes/makefuncs.h"
 #include "tcop/utility.h"
 #include "utils/builtins.h"
+#include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
@@ -197,6 +201,15 @@ multi_ProcessUtility(PlannedStmt *pstmt,
 		ErrorIfUnstableCreateOrAlterExtensionStmt(parsetree);
 	}
 
+	if (IsA(parsetree, CreateExtensionStmt))
+	{
+		/*
+		 * Postgres forbids creating/altering other extensions from within an extension script, so we use a utility hook instead
+		 * This preprocess check whether citus_columnar should be installed first before citus
+		 */
+		PreprocessCreateExtensionStmtForCitusColumnar(parsetree);
+	}
+
 	if (!CitusHasBeenLoaded())
 	{
 		/*
@@ -662,11 +675,26 @@ ProcessUtilityInternal(PlannedStmt *pstmt,
 		if (isAlterExtensionUpdateCitusStmt)
 		{
 			citusCanBeUpdatedToAvailableVersion = !InstalledAndAvailableVersionsSame();
+
+			/*
+			 * Check whether need to install/drop citus_columnar when upgrade/downgrade citus
+			 */
+			PreprocessAlterExtensionCitusStmtForCitusColumnar(parsetree);
 		}
 
 		PrevProcessUtility_compat(pstmt, queryString, false, context,
 								  params, queryEnv, dest, completionTag);
 
+		if (isAlterExtensionUpdateCitusStmt)
+		{
+			/*
+			 * Post process, upgrade citus_columnar from fake internal version to normal version if upgrade citus
+			 * or drop citus_columnar fake version when downgrade citus to older version that do not support
+			 * citus_columnar
+			 */
+			PostprocessAlterExtensionCitusStmtForCitusColumnar(parsetree);
+		}
+
 		/*
 		 * if we are running ALTER EXTENSION citus UPDATE (to "<version>") command, we may need
 		 * to mark existing objects as distributed depending on the "version" parameter if
diff --git a/src/backend/distributed/sql/citus--10.0-1--10.0-2.sql b/src/backend/distributed/sql/citus--10.0-1--10.0-2.sql
index 746674a5a..d5d1c10cf 100644
--- a/src/backend/distributed/sql/citus--10.0-1--10.0-2.sql
+++ b/src/backend/distributed/sql/citus--10.0-1--10.0-2.sql
@@ -1,5 +1,17 @@
 -- citus--10.0-1--10.0-2
 
-#include "../../columnar/sql/columnar--10.0-1--10.0-2.sql"
+--#include "../../columnar/sql/columnar--10.0-1--10.0-2.sql"
+DO $check_columnar$
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
+    #include "../../columnar/sql/columnar--10.0-1--10.0-2.sql"
+  END IF;
+END;
+$check_columnar$;
 
 GRANT SELECT ON public.citus_tables TO public;
+
diff --git a/src/backend/distributed/sql/citus--10.0-4--10.1-1.sql b/src/backend/distributed/sql/citus--10.0-4--10.1-1.sql
index 1b9b32e34..33cb46107 100644
--- a/src/backend/distributed/sql/citus--10.0-4--10.1-1.sql
+++ b/src/backend/distributed/sql/citus--10.0-4--10.1-1.sql
@@ -3,13 +3,25 @@
 -- add the current database to the distributed objects if not already in there.
 -- this is to reliably propagate some of the alter database commands that might be
 -- supported.
+
 INSERT INTO citus.pg_dist_object SELECT
   'pg_catalog.pg_database'::regclass::oid AS oid,
   (SELECT oid FROM pg_database WHERE datname = current_database()) as objid,
   0 as objsubid
 ON CONFLICT DO NOTHING;
 
-#include "../../columnar/sql/columnar--10.0-3--10.1-1.sql"
+--#include "../../columnar/sql/columnar--10.0-3--10.1-1.sql"
+DO $check_columnar$
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
+      #include "../../columnar/sql/columnar--10.0-3--10.1-1.sql"
+  END IF;
+END;
+$check_columnar$;
 #include "udfs/create_distributed_table/10.1-1.sql";
 #include "udfs/worker_partitioned_relation_total_size/10.1-1.sql"
 #include "udfs/worker_partitioned_relation_size/10.1-1.sql"
diff --git a/src/backend/distributed/sql/citus--10.1-1--10.2-1.sql b/src/backend/distributed/sql/citus--10.1-1--10.2-1.sql
index 507a141c5..2dac31069 100644
--- a/src/backend/distributed/sql/citus--10.1-1--10.2-1.sql
+++ b/src/backend/distributed/sql/citus--10.1-1--10.2-1.sql
@@ -9,7 +9,19 @@ GRANT ALL ON FUNCTION pg_catalog.worker_record_sequence_dependency(regclass,regc
 ALTER TABLE pg_catalog.pg_dist_placement ADD CONSTRAINT placement_shardid_groupid_unique_index UNIQUE (shardid, groupid);
 
 #include "udfs/stop_metadata_sync_to_node/10.2-1.sql"
-#include "../../columnar/sql/columnar--10.1-1--10.2-1.sql"
+--#include "../../columnar/sql/columnar--10.1-1--10.2-1.sql"
+DO $check_columnar$
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
+      #include "../../columnar/sql/columnar--10.1-1--10.2-1.sql"
+  END IF;
+END;
+$check_columnar$;
+
 #include "udfs/citus_internal_add_partition_metadata/10.2-1.sql";
 #include "udfs/citus_internal_add_shard_metadata/10.2-1.sql";
 #include "udfs/citus_internal_add_placement_metadata/10.2-1.sql";
@@ -21,6 +33,7 @@ ALTER TABLE pg_catalog.pg_dist_placement ADD CONSTRAINT placement_shardid_groupi
 #include "udfs/get_missing_time_partition_ranges/10.2-1.sql"
 #include "udfs/worker_nextval/10.2-1.sql"
 
+
 DROP FUNCTION pg_catalog.citus_drop_all_shards(regclass, text, text);
 CREATE FUNCTION pg_catalog.citus_drop_all_shards(logicalrelid regclass,
                                                  schema_name text,
@@ -34,3 +47,4 @@ COMMENT ON FUNCTION pg_catalog.citus_drop_all_shards(regclass, text, text, boole
 #include "udfs/citus_drop_trigger/10.2-1.sql";
 #include "udfs/citus_prepare_pg_upgrade/10.2-1.sql"
 #include "udfs/citus_finish_pg_upgrade/10.2-1.sql"
+
diff --git a/src/backend/distributed/sql/citus--10.2-1--10.2-2.sql b/src/backend/distributed/sql/citus--10.2-1--10.2-2.sql
index df2b65f87..eef1152a9 100644
--- a/src/backend/distributed/sql/citus--10.2-1--10.2-2.sql
+++ b/src/backend/distributed/sql/citus--10.2-1--10.2-2.sql
@@ -2,4 +2,16 @@
 
 -- bump version to 10.2-2
 
-#include "../../columnar/sql/columnar--10.2-1--10.2-2.sql"
+--#include "../../columnar/sql/columnar--10.2-1--10.2-2.sql"
+DO $check_columnar$
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
+      #include "../../columnar/sql/columnar--10.2-1--10.2-2.sql"
+  END IF;
+END;
+$check_columnar$;
+
diff --git a/src/backend/distributed/sql/citus--10.2-2--10.2-3.sql b/src/backend/distributed/sql/citus--10.2-2--10.2-3.sql
index bbfb59ae9..66316eaf0 100644
--- a/src/backend/distributed/sql/citus--10.2-2--10.2-3.sql
+++ b/src/backend/distributed/sql/citus--10.2-2--10.2-3.sql
@@ -2,4 +2,15 @@
 
 -- bump version to 10.2-3
 
-#include "../../columnar/sql/columnar--10.2-2--10.2-3.sql"
+--#include "../../columnar/sql/columnar--10.2-2--10.2-3.sql"
+DO $check_columnar$
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
+      #include "../../columnar/sql/columnar--10.2-2--10.2-3.sql"
+  END IF;
+END;
+$check_columnar$;
diff --git a/src/backend/distributed/sql/citus--10.2-3--10.2-4.sql b/src/backend/distributed/sql/citus--10.2-3--10.2-4.sql
index b32b12066..3c1f8afb0 100644
--- a/src/backend/distributed/sql/citus--10.2-3--10.2-4.sql
+++ b/src/backend/distributed/sql/citus--10.2-3--10.2-4.sql
@@ -2,9 +2,20 @@
 
 -- bump version to 10.2-4
 
-#include "../../columnar/sql/columnar--10.2-3--10.2-4.sql"
+DO $check_columnar$
+BEGIN
+IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
+    #include "../../columnar/sql/columnar--10.2-3--10.2-4.sql"
+END IF;
+END;
+$check_columnar$;
 
 #include "udfs/fix_partition_shard_index_names/10.2-4.sql"
 #include "udfs/fix_all_partition_shard_index_names/10.2-4.sql"
 #include "udfs/worker_fix_partition_shard_index_names/10.2-4.sql"
 #include "udfs/citus_finish_pg_upgrade/10.2-4.sql"
+
diff --git a/src/backend/distributed/sql/citus--11.0-3--11.1-1.sql b/src/backend/distributed/sql/citus--11.0-3--11.1-1.sql
index 20273e914..625a62ca7 100644
--- a/src/backend/distributed/sql/citus--11.0-3--11.1-1.sql
+++ b/src/backend/distributed/sql/citus--11.0-3--11.1-1.sql
@@ -7,7 +7,59 @@ DROP FUNCTION pg_catalog.worker_merge_files_into_table(bigint, integer, text[],
 DROP FUNCTION pg_catalog.worker_range_partition_table(bigint, integer, text, text, oid, anyarray);
 DROP FUNCTION pg_catalog.worker_repartition_cleanup(bigint);
 
-#include "../../columnar/sql/columnar--11.0-3--11.1-1.sql"
+DO $check_columnar$
+BEGIN
+IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
+    #include "../../columnar/sql/columnar--11.0-3--11.1-1.sql"
+END IF;
+END;
+$check_columnar$;
+
+-- If upgrading citus, the columnar objects are already being a part of the
+-- citus extension, and must be detached so that they can be attached
+-- to the citus_columnar extension.
+DO $check_citus$
+BEGIN
+  IF EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus' and p.proname = 'columnar_handler'
+  ) THEN
+    ALTER EXTENSION citus DROP SCHEMA columnar;
+    ALTER EXTENSION citus DROP SCHEMA columnar_internal;
+    ALTER EXTENSION citus DROP SEQUENCE columnar_internal.storageid_seq;
+
+    -- columnar tables
+    ALTER EXTENSION citus DROP TABLE columnar_internal.options;
+    ALTER EXTENSION citus DROP TABLE columnar_internal.stripe;
+    ALTER EXTENSION citus DROP TABLE columnar_internal.chunk_group;
+    ALTER EXTENSION citus DROP TABLE columnar_internal.chunk;
+
+    ALTER EXTENSION citus DROP FUNCTION columnar_internal.columnar_handler;
+    ALTER EXTENSION citus DROP ACCESS METHOD columnar;
+    ALTER EXTENSION citus DROP FUNCTION pg_catalog.alter_columnar_table_set;
+    ALTER EXTENSION citus DROP FUNCTION pg_catalog.alter_columnar_table_reset;
+    ALTER EXTENSION citus DROP FUNCTION columnar.get_storage_id;
+
+    -- columnar view
+    ALTER EXTENSION citus DROP VIEW columnar.storage;
+    ALTER EXTENSION citus DROP VIEW columnar.options;
+    ALTER EXTENSION citus DROP VIEW columnar.stripe;
+    ALTER EXTENSION citus DROP VIEW columnar.chunk_group;
+    ALTER EXTENSION citus DROP VIEW columnar.chunk;
+
+    -- functions under citus_internal for columnar
+    ALTER EXTENSION citus DROP FUNCTION citus_internal.upgrade_columnar_storage;
+    ALTER EXTENSION citus DROP FUNCTION citus_internal.downgrade_columnar_storage;
+    ALTER EXTENSION citus DROP FUNCTION citus_internal.columnar_ensure_am_depends_catalog;
+
+  END IF;
+END $check_citus$;
+#include "udfs/citus_finish_pg_upgrade/11.1-1.sql"
 
 DROP FUNCTION pg_catalog.get_all_active_transactions(OUT datid oid, OUT process_id int, OUT initiator_node_identifier int4,
                                                      OUT worker_query BOOL, OUT transaction_number int8, OUT transaction_stamp timestamptz,
diff --git a/src/backend/distributed/sql/citus--9.5-1--10.0-4.sql b/src/backend/distributed/sql/citus--9.5-1--10.0-4.sql
index 3f035f3a6..f6d0198da 100644
--- a/src/backend/distributed/sql/citus--9.5-1--10.0-4.sql
+++ b/src/backend/distributed/sql/citus--9.5-1--10.0-4.sql
@@ -6,7 +6,6 @@
 -- cat citus--9.5-1--10.0-1.sql citus--10.0-1--10.0-2.sql citus--10.0-2--10.0-3.sql > citus--9.5-1--10.0-4.sql
 
 -- copy of citus--9.5-1--10.0-1
-
 DROP FUNCTION pg_catalog.upgrade_to_reference_table(regclass);
 DROP FUNCTION IF EXISTS pg_catalog.citus_total_relation_size(regclass);
 
@@ -35,7 +34,18 @@ DROP FUNCTION IF EXISTS pg_catalog.citus_total_relation_size(regclass);
 #include "udfs/worker_change_sequence_dependency/10.0-1.sql"
 #include "udfs/remove_local_tables_from_metadata/10.0-1.sql"
 
+--#include "../../columnar/sql/columnar--9.5-1--10.0-1.sql"
+DO $check_columnar$
+BEGIN
+IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
 #include "../../columnar/sql/columnar--9.5-1--10.0-1.sql"
+END IF;
+END;
+$check_columnar$;
 
 #include "udfs/time_partition_range/10.0-1.sql"
 #include "udfs/time_partitions/10.0-1.sql"
@@ -172,7 +182,19 @@ GRANT SELECT ON pg_catalog.citus_worker_stat_activity TO PUBLIC;
 
 -- copy of citus--10.0-1--10.0-2
 
+--#include "../../columnar/sql/columnar--10.0-1--10.0-2.sql"
+DO $check_columnar$
+BEGIN
+IF NOT EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
+             INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+             INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+             WHERE e.extname='citus_columnar' and p.proname = 'columnar_handler'
+  ) THEN
 #include "../../columnar/sql/columnar--10.0-1--10.0-2.sql"
+END IF;
+END;
+$check_columnar$;
+
 
 -- copy of citus--10.0-2--10.0-3
 
@@ -215,3 +237,4 @@ COMMENT ON FUNCTION pg_catalog.citus_get_active_worker_nodes()
 
 
 RESET search_path;
+
diff --git a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-3.sql b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-3.sql
index e832d9730..5c0390061 100644
--- a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-3.sql
+++ b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-3.sql
@@ -46,7 +46,23 @@ CREATE FUNCTION pg_catalog.worker_repartition_cleanup(bigint)
  STRICT
 AS 'MODULE_PATHNAME', $function$worker_repartition_cleanup$function$;
 
-#include "../../../columnar/sql/downgrades/columnar--11.1-1--11.0-3.sql"
+-- add relations to citus
+ALTER EXTENSION citus ADD SCHEMA columnar;
+ALTER EXTENSION citus ADD SEQUENCE columnar.storageid_seq;
+ALTER EXTENSION citus ADD TABLE columnar.options;
+ALTER EXTENSION citus ADD TABLE columnar.stripe;
+ALTER EXTENSION citus ADD TABLE columnar.chunk_group;
+ALTER EXTENSION citus ADD TABLE columnar.chunk;
+
+ALTER EXTENSION citus ADD FUNCTION columnar.columnar_handler;
+ALTER EXTENSION citus ADD ACCESS METHOD columnar;
+ALTER EXTENSION citus ADD FUNCTION pg_catalog.alter_columnar_table_set;
+ALTER EXTENSION citus ADD FUNCTION pg_catalog.alter_columnar_table_reset;
+
+ALTER EXTENSION citus ADD FUNCTION citus_internal.upgrade_columnar_storage;
+ALTER EXTENSION citus ADD FUNCTION citus_internal.downgrade_columnar_storage;
+ALTER EXTENSION citus ADD FUNCTION citus_internal.columnar_ensure_am_depends_catalog;
+
 
 DROP FUNCTION pg_catalog.get_all_active_transactions(OUT datid oid, OUT process_id int, OUT initiator_node_identifier int4,
                                                      OUT worker_query BOOL, OUT transaction_number int8, OUT transaction_stamp timestamptz,
diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.1-1.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.1-1.sql
new file mode 100644
index 000000000..caa80d51e
--- /dev/null
+++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.1-1.sql
@@ -0,0 +1,151 @@
+CREATE OR REPLACE FUNCTION pg_catalog.citus_finish_pg_upgrade()
+    RETURNS void
+    LANGUAGE plpgsql
+    SET search_path = pg_catalog
+    AS $cppu$
+DECLARE
+    table_name regclass;
+    command text;
+    trigger_name text;
+BEGIN
+
+
+    IF substring(current_Setting('server_version'), '\d+')::int >= 14 THEN
+    EXECUTE $cmd$
+        -- disable propagation to prevent EnsureCoordinator errors
+        -- the aggregate created here does not depend on Citus extension (yet)
+        -- since we add the dependency with the next command
+        SET citus.enable_ddl_propagation TO OFF;
+        CREATE AGGREGATE array_cat_agg(anycompatiblearray) (SFUNC = array_cat, STYPE = anycompatiblearray);
+        COMMENT ON AGGREGATE array_cat_agg(anycompatiblearray)
+        IS 'concatenate input arrays into a single array';
+        RESET citus.enable_ddl_propagation;
+    $cmd$;
+    ELSE
+    EXECUTE $cmd$
+        SET citus.enable_ddl_propagation TO OFF;
+        CREATE AGGREGATE array_cat_agg(anyarray) (SFUNC = array_cat, STYPE = anyarray);
+        COMMENT ON AGGREGATE array_cat_agg(anyarray)
+        IS 'concatenate input arrays into a single array';
+        RESET citus.enable_ddl_propagation;
+    $cmd$;
+    END IF;
+
+    --
+    -- Citus creates the array_cat_agg but because of a compatibility
+    -- issue between pg13-pg14, we drop and create it during upgrade.
+    -- And as Citus creates it, there needs to be a dependency to the
+    -- Citus extension, so we create that dependency here.
+    -- We are not using:
+    --  ALTER EXENSION citus DROP/CREATE AGGREGATE array_cat_agg
+    -- because we don't have an easy way to check if the aggregate
+    -- exists with anyarray type or anycompatiblearray type.
+
+    INSERT INTO pg_depend
+    SELECT
+        'pg_proc'::regclass::oid as classid,
+        (SELECT oid FROM pg_proc WHERE proname = 'array_cat_agg') as objid,
+        0 as objsubid,
+        'pg_extension'::regclass::oid as refclassid,
+        (select oid from pg_extension where extname = 'citus') as refobjid,
+        0 as refobjsubid ,
+        'e' as deptype;
+
+    --
+    -- restore citus catalog tables
+    --
+    INSERT INTO pg_catalog.pg_dist_partition SELECT * FROM public.pg_dist_partition;
+    INSERT INTO pg_catalog.pg_dist_shard SELECT * FROM public.pg_dist_shard;
+    INSERT INTO pg_catalog.pg_dist_placement SELECT * FROM public.pg_dist_placement;
+    INSERT INTO pg_catalog.pg_dist_node_metadata SELECT * FROM public.pg_dist_node_metadata;
+    INSERT INTO pg_catalog.pg_dist_node SELECT * FROM public.pg_dist_node;
+    INSERT INTO pg_catalog.pg_dist_local_group SELECT * FROM public.pg_dist_local_group;
+    INSERT INTO pg_catalog.pg_dist_transaction SELECT * FROM public.pg_dist_transaction;
+    INSERT INTO pg_catalog.pg_dist_colocation SELECT * FROM public.pg_dist_colocation;
+    -- enterprise catalog tables
+    INSERT INTO pg_catalog.pg_dist_authinfo SELECT * FROM public.pg_dist_authinfo;
+    INSERT INTO pg_catalog.pg_dist_poolinfo SELECT * FROM public.pg_dist_poolinfo;
+
+    INSERT INTO pg_catalog.pg_dist_rebalance_strategy SELECT
+        name,
+        default_strategy,
+        shard_cost_function::regprocedure::regproc,
+        node_capacity_function::regprocedure::regproc,
+        shard_allowed_on_node_function::regprocedure::regproc,
+        default_threshold,
+        minimum_threshold,
+        improvement_threshold
+    FROM public.pg_dist_rebalance_strategy;
+
+    --
+    -- drop backup tables
+    --
+    DROP TABLE public.pg_dist_authinfo;
+    DROP TABLE public.pg_dist_colocation;
+    DROP TABLE public.pg_dist_local_group;
+    DROP TABLE public.pg_dist_node;
+    DROP TABLE public.pg_dist_node_metadata;
+    DROP TABLE public.pg_dist_partition;
+    DROP TABLE public.pg_dist_placement;
+    DROP TABLE public.pg_dist_poolinfo;
+    DROP TABLE public.pg_dist_shard;
+    DROP TABLE public.pg_dist_transaction;
+    DROP TABLE public.pg_dist_rebalance_strategy;
+
+    --
+    -- reset sequences
+    --
+    PERFORM setval('pg_catalog.pg_dist_shardid_seq', (SELECT MAX(shardid)+1 AS max_shard_id FROM pg_dist_shard), false);
+    PERFORM setval('pg_catalog.pg_dist_placement_placementid_seq', (SELECT MAX(placementid)+1 AS max_placement_id FROM pg_dist_placement), false);
+    PERFORM setval('pg_catalog.pg_dist_groupid_seq', (SELECT MAX(groupid)+1 AS max_group_id FROM pg_dist_node), false);
+    PERFORM setval('pg_catalog.pg_dist_node_nodeid_seq', (SELECT MAX(nodeid)+1 AS max_node_id FROM pg_dist_node), false);
+    PERFORM setval('pg_catalog.pg_dist_colocationid_seq', (SELECT MAX(colocationid)+1 AS max_colocation_id FROM pg_dist_colocation), false);
+
+    --
+    -- register triggers
+    --
+    FOR table_name IN SELECT logicalrelid FROM pg_catalog.pg_dist_partition
+    LOOP
+        trigger_name := 'truncate_trigger_' || table_name::oid;
+        command := 'create trigger ' || trigger_name || ' after truncate on ' || table_name || ' execute procedure pg_catalog.citus_truncate_trigger()';
+        EXECUTE command;
+        command := 'update pg_trigger set tgisinternal = true where tgname = ' || quote_literal(trigger_name);
+        EXECUTE command;
+    END LOOP;
+
+    --
+    -- set dependencies
+    --
+    INSERT INTO pg_depend
+    SELECT
+        'pg_class'::regclass::oid as classid,
+        p.logicalrelid::regclass::oid as objid,
+        0 as objsubid,
+        'pg_extension'::regclass::oid as refclassid,
+        (select oid from pg_extension where extname = 'citus') as refobjid,
+        0 as refobjsubid ,
+        'n' as deptype
+    FROM pg_catalog.pg_dist_partition p;
+
+    -- set dependencies for columnar table access method
+    PERFORM columnar_internal.columnar_ensure_am_depends_catalog();
+
+    -- restore pg_dist_object from the stable identifiers
+    TRUNCATE pg_catalog.pg_dist_object;
+    INSERT INTO pg_catalog.pg_dist_object (classid, objid, objsubid, distribution_argument_index, colocationid)
+    SELECT
+        address.classid,
+        address.objid,
+        address.objsubid,
+        naming.distribution_argument_index,
+        naming.colocationid
+    FROM
+        public.pg_dist_object naming,
+        pg_catalog.pg_get_object_address(naming.type, naming.object_names, naming.object_args) address;
+
+    DROP TABLE public.pg_dist_object;
+END;
+$cppu$;
+
+COMMENT ON FUNCTION pg_catalog.citus_finish_pg_upgrade()
+    IS 'perform tasks to restore citus settings from a location that has been prepared before pg_upgrade';
diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql
index 2c2635687..caa80d51e 100644
--- a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql
+++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql
@@ -128,7 +128,7 @@ BEGIN
     FROM pg_catalog.pg_dist_partition p;
 
     -- set dependencies for columnar table access method
-    PERFORM citus_internal.columnar_ensure_am_depends_catalog();
+    PERFORM columnar_internal.columnar_ensure_am_depends_catalog();
 
     -- restore pg_dist_object from the stable identifiers
     TRUNCATE pg_catalog.pg_dist_object;
diff --git a/src/include/columnar/columnar.h b/src/include/columnar/columnar.h
index e8868808e..7b2924576 100644
--- a/src/include/columnar/columnar.h
+++ b/src/include/columnar/columnar.h
@@ -53,6 +53,9 @@
 #define COLUMNAR_POSTSCRIPT_SIZE_MAX 256
 #define COLUMNAR_BYTES_PER_PAGE (BLCKSZ - SizeOfPageHeaderData)
 
+/*global variables for citus_columnar fake version Y */
+#define CITUS_COLUMNAR_INTERNAL_VERSION "11.1-0"
+
 /*
  * ColumnarOptions holds the option values to be used when reading or writing
  * a columnar table. To resolve these values, we first check foreign table's options,
diff --git a/src/include/columnar/columnar_tableam.h b/src/include/columnar/columnar_tableam.h
index 2f06e0972..04f93fe30 100644
--- a/src/include/columnar/columnar_tableam.h
+++ b/src/include/columnar/columnar_tableam.h
@@ -58,6 +58,9 @@ extern TableScanDesc columnar_beginscan_extended(Relation relation, Snapshot sna
 extern int64 ColumnarScanChunkGroupsFiltered(ColumnarScanDesc columnarScanDesc);
 extern bool ColumnarSupportsIndexAM(char *indexAMName);
 extern bool IsColumnarTableAmTable(Oid relationId);
-
+extern void CheckCitusColumnarCreateExtensionStmt(Node *parseTree);
+extern void CheckCitusColumnarAlterExtensionStmt(Node *parseTree);
+extern DefElem * GetExtensionOption(List *extensionOptions,
+									const char *defname);
 
 #endif /* COLUMNAR_TABLEAM_H */
diff --git a/src/include/distributed/commands.h b/src/include/distributed/commands.h
index ad5c4eb5d..370810cfa 100644
--- a/src/include/distributed/commands.h
+++ b/src/include/distributed/commands.h
@@ -184,6 +184,9 @@ extern Oid get_constraint_typid(Oid conoid);
 extern bool IsDropCitusExtensionStmt(Node *parsetree);
 extern List * GetDependentFDWsToExtension(Oid extensionId);
 extern bool IsCreateAlterExtensionUpdateCitusStmt(Node *parsetree);
+extern void PreprocessCreateExtensionStmtForCitusColumnar(Node *parsetree);
+extern void PreprocessAlterExtensionCitusStmtForCitusColumnar(Node *parsetree);
+extern void PostprocessAlterExtensionCitusStmtForCitusColumnar(Node *parsetree);
 extern bool ShouldMarkRelationDistributed(Oid relationId);
 extern void ErrorIfUnstableCreateOrAlterExtensionStmt(Node *parsetree);
 extern List * PostprocessCreateExtensionStmt(Node *stmt, const char *queryString);
@@ -209,7 +212,9 @@ extern ObjectAddress AlterExtensionSchemaStmtObjectAddress(Node *stmt,
 														   bool missing_ok);
 extern ObjectAddress AlterExtensionUpdateStmtObjectAddress(Node *stmt,
 														   bool missing_ok);
-
+extern void CreateExtensionWithVersion(char *extname, char *extVersion);
+extern void AlterExtensionUpdateStmt(char *extname, char *extVersion);
+extern int GetExtensionVersionNumber(char *extVersion);
 
 /* foreign_constraint.c - forward declarations */
 extern bool ConstraintIsAForeignKeyToReferenceTable(char *constraintName,
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index ec42e0556..3847e67ea 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -209,7 +209,7 @@ check-operations: all
 	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/operations_schedule $(EXTRA_TESTS)
 
 check-columnar:
-	$(pg_regress_multi_check) --load-extension=citus \
+	$(pg_regress_multi_check) --load-extension=citus_columnar --load-extension=citus \
 	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS)
 
 check-columnar-isolation: all  $(isolation_test_files)
diff --git a/src/test/regress/expected/columnar_drop.out b/src/test/regress/expected/columnar_drop.out
index 8d2c519a1..75333c1e8 100644
--- a/src/test/regress/expected/columnar_drop.out
+++ b/src/test/regress/expected/columnar_drop.out
@@ -42,13 +42,13 @@ NOTICE:  Citus partially supports CREATE DATABASE for distributed databases
 DETAIL:  Citus does not propagate CREATE DATABASE command to workers
 HINT:  You can manually create a database and its extensions on workers.
 \c db_to_drop
-CREATE EXTENSION citus;
+CREATE EXTENSION citus_columnar;
 SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
 CREATE TABLE test_table(data int) USING columnar;
-DROP EXTENSION citus CASCADE;
+DROP EXTENSION citus_columnar CASCADE;
 NOTICE:  drop cascades to table test_table
 -- test database drop
-CREATE EXTENSION citus;
+CREATE EXTENSION citus_columnar;
 SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
 CREATE TABLE test_table(data int) USING columnar;
 \c :datname
diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out
index 3f1482715..33cab2776 100644
--- a/src/test/regress/expected/multi_extension.out
+++ b/src/test/regress/expected/multi_extension.out
@@ -103,6 +103,7 @@ ORDER BY 1, 2;
 
 -- DROP EXTENSION pre-created by the regression suite
 DROP EXTENSION citus;
+DROP EXTENSION citus_columnar;
 \c
 -- these tests switch between citus versions and call ddl's that require pg_dist_object to be created
 SET citus.enable_metadata_sync TO 'false';
@@ -1079,8 +1080,14 @@ SELECT * FROM multi_extension.print_extension_changes();
 -- Snapshot of state at 11.1-1
 ALTER EXTENSION citus UPDATE TO '11.1-1';
 SELECT * FROM multi_extension.print_extension_changes();
-                                    previous_object                                     |                             current_object
+                                    previous_object                                     | current_object
 ---------------------------------------------------------------------
+ access method columnar                                                                 |
+ function alter_columnar_table_reset(regclass,boolean,boolean,boolean,boolean) void     |
+ function alter_columnar_table_set(regclass,integer,integer,name,integer) void          |
+ function citus_internal.columnar_ensure_am_depends_catalog() void                      |
+ function citus_internal.downgrade_columnar_storage(regclass) void                      |
+ function citus_internal.upgrade_columnar_storage(regclass) void                        |
  function columnar.columnar_handler(internal) table_am_handler                          |
  function worker_cleanup_job_schema_cache() void                                        |
  function worker_create_schema(bigint,text) void                                        |
@@ -1090,25 +1097,13 @@ SELECT * FROM multi_extension.print_extension_changes();
  function worker_merge_files_into_table(bigint,integer,text[],text[]) void              |
  function worker_range_partition_table(bigint,integer,text,text,oid,anyarray) void      |
  function worker_repartition_cleanup(bigint) void                                       |
+ schema columnar                                                                        |
  sequence columnar.storageid_seq                                                        |
  table columnar.chunk                                                                   |
  table columnar.chunk_group                                                             |
  table columnar.options                                                                 |
  table columnar.stripe                                                                  |
-                                                                                        | function columnar.get_storage_id(regclass) bigint
-                                                                                        | function columnar_internal.columnar_handler(internal) table_am_handler
-                                                                                        | schema columnar_internal
-                                                                                        | sequence columnar_internal.storageid_seq
-                                                                                        | table columnar_internal.chunk
-                                                                                        | table columnar_internal.chunk_group
-                                                                                        | table columnar_internal.options
-                                                                                        | table columnar_internal.stripe
-                                                                                        | view columnar.chunk
-                                                                                        | view columnar.chunk_group
-                                                                                        | view columnar.options
-                                                                                        | view columnar.storage
-                                                                                        | view columnar.stripe
-(27 rows)
+(21 rows)
 
 DROP TABLE multi_extension.prev_objects, multi_extension.extension_diff;
 -- show running version
@@ -1137,6 +1132,7 @@ ORDER BY 1, 2;
 RESET citus.enable_version_checks;
 RESET columnar.enable_version_checks;
 DROP EXTENSION citus;
+DROP EXTENSION citus_columnar;
 CREATE EXTENSION citus VERSION '8.0-1';
 ERROR:  specified version incompatible with loaded Citus library
 DETAIL:  Loaded library requires 11.1, but 8.0-1 was specified.
@@ -1213,11 +1209,13 @@ NOTICE:  version "9.1-1" of extension "citus" is already installed
 ALTER EXTENSION citus UPDATE;
 -- re-create in newest version
 DROP EXTENSION citus;
+DROP EXTENSION citus_columnar;
 \c
 CREATE EXTENSION citus;
 -- test cache invalidation in workers
 \c - - - :worker_1_port
 DROP EXTENSION citus;
+DROP EXTENSION citus_columnar;
 SET citus.enable_version_checks TO 'false';
 SET columnar.enable_version_checks TO 'false';
 CREATE EXTENSION citus VERSION '8.0-1';
diff --git a/src/test/regress/expected/multi_fix_partition_shard_index_names.out b/src/test/regress/expected/multi_fix_partition_shard_index_names.out
index 090ebdd4e..fa1b2c1ff 100644
--- a/src/test/regress/expected/multi_fix_partition_shard_index_names.out
+++ b/src/test/regress/expected/multi_fix_partition_shard_index_names.out
@@ -646,14 +646,34 @@ CREATE TABLE p2(dist_col int NOT NULL, another_col int, partition_col timestamp
 ALTER TABLE parent_table ATTACH PARTITION p2 FOR VALUES FROM ('2019-01-01') TO ('2020-01-01');
 NOTICE:  issuing BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;SELECT assign_distributed_transaction_id(xx, xx, 'xxxxxxx');
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing SET citus.enable_ddl_propagation TO 'off'
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing CREATE EXTENSION IF NOT EXISTS citus_columnar WITH SCHEMA  pg_catalog VERSION "11.1-1";
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing COMMIT
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;SELECT assign_distributed_transaction_id(xx, xx, 'xxxxxxx');
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing SET citus.enable_ddl_propagation TO 'off'
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing CREATE EXTENSION IF NOT EXISTS citus_columnar WITH SCHEMA  pg_catalog VERSION "11.1-1";
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing COMMIT
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;SELECT assign_distributed_transaction_id(xx, xx, 'xxxxxxx');
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;SELECT assign_distributed_transaction_id(xx, xx, 'xxxxxxx');
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing WITH distributed_object_data(typetext, objnames, objargs, distargumentindex, colocationid, force_delegation)  AS (VALUES ('extension', ARRAY['citus_columnar']::text[], ARRAY[]::text[], -1, 0, false)) SELECT citus_internal_add_object_metadata(typetext, objnames, objargs, distargumentindex::int, colocationid::int, force_delegation::bool) FROM distributed_object_data;
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing WITH distributed_object_data(typetext, objnames, objargs, distargumentindex, colocationid, force_delegation)  AS (VALUES ('extension', ARRAY['citus_columnar']::text[], ARRAY[]::text[], -1, 0, false)) SELECT citus_internal_add_object_metadata(typetext, objnames, objargs, distargumentindex::int, colocationid::int, force_delegation::bool) FROM distributed_object_data;
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing SELECT worker_apply_shard_ddl_command (915002, 'fix_idx_names', 'CREATE TABLE fix_idx_names.p2 (dist_col integer NOT NULL, another_col integer, partition_col timestamp without time zone NOT NULL, name text) USING columnar')
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing ALTER TABLE fix_idx_names.p2_915002 SET (columnar.chunk_group_row_limit = 10000, columnar.stripe_row_limit = 150000, columnar.compression_level = 3, columnar.compression = 'zstd');
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing SELECT worker_apply_shard_ddl_command (915002, 'fix_idx_names', 'ALTER TABLE fix_idx_names.p2 OWNER TO postgres')
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
-NOTICE:  issuing BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;SELECT assign_distributed_transaction_id(xx, xx, 'xxxxxxx');
-DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing SET citus.enable_ddl_propagation TO 'off'
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing SET citus.enable_ddl_propagation TO 'off'
diff --git a/src/test/regress/expected/upgrade_columnar_metapage_after.out b/src/test/regress/expected/upgrade_columnar_metapage_after.out
index 7268167dd..87e2424cb 100644
--- a/src/test/regress/expected/upgrade_columnar_metapage_after.out
+++ b/src/test/regress/expected/upgrade_columnar_metapage_after.out
@@ -94,7 +94,7 @@ SELECT version_major, version_minor, reserved_stripe_id, reserved_row_number
 (1 row)
 
 -- table is already upgraded, make sure that upgrade_columnar_metapage is no-op
-SELECT citus_internal.upgrade_columnar_storage(c.oid)
+SELECT columnar_internal.upgrade_columnar_storage(c.oid)
 FROM pg_class c, pg_am a
 WHERE c.relam = a.oid AND amname = 'columnar' and relname = 'columnar_table_2';
  upgrade_columnar_storage
diff --git a/src/test/regress/expected/upgrade_list_citus_objects.out b/src/test/regress/expected/upgrade_list_citus_objects.out
index e361a7040..e7e601f3f 100644
--- a/src/test/regress/expected/upgrade_list_citus_objects.out
+++ b/src/test/regress/expected/upgrade_list_citus_objects.out
@@ -16,10 +16,7 @@ WHERE refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass
 ORDER BY 1;
                                                        description
 ---------------------------------------------------------------------
- access method columnar
  event trigger citus_cascade_to_partition
- function alter_columnar_table_reset(regclass,boolean,boolean,boolean,boolean)
- function alter_columnar_table_set(regclass,integer,integer,name,integer)
  function alter_distributed_table(regclass,text,integer,text,boolean)
  function alter_old_partitions_set_access_method(regclass,timestamp with time zone,name)
  function alter_role_if_exists(text,text)
@@ -63,8 +60,6 @@ ORDER BY 1;
  function citus_finish_citus_upgrade()
  function citus_finish_pg_upgrade()
  function citus_get_active_worker_nodes()
- function citus_internal.columnar_ensure_am_depends_catalog()
- function citus_internal.downgrade_columnar_storage(regclass)
  function citus_internal.find_groupid_for_node(text,integer)
  function citus_internal.pg_dist_node_trigger_func()
  function citus_internal.pg_dist_rebalance_strategy_trigger_func()
@@ -72,7 +67,6 @@ ORDER BY 1;
  function citus_internal.refresh_isolation_tester_prepared_statement()
  function citus_internal.replace_isolation_tester_func()
  function citus_internal.restore_isolation_tester_func()
- function citus_internal.upgrade_columnar_storage(regclass)
  function citus_internal_add_colocation_metadata(integer,integer,integer,regtype,oid)
  function citus_internal_add_object_metadata(text,text[],text[],integer,integer,boolean)
  function citus_internal_add_partition_metadata(regclass,"char",text,integer,"char")
@@ -129,8 +123,6 @@ ORDER BY 1;
  function citus_version()
  function column_name_to_column(regclass,text)
  function column_to_column_name(regclass,text)
- function columnar.get_storage_id(regclass)
- function columnar_internal.columnar_handler(internal)
  function coord_combine_agg(oid,cstring,anyelement)
  function coord_combine_agg_ffunc(internal,oid,cstring,anyelement)
  function coord_combine_agg_sfunc(internal,oid,cstring,anyelement)
@@ -243,18 +235,11 @@ ORDER BY 1;
  function worker_save_query_explain_analyze(text,jsonb)
  schema citus
  schema citus_internal
- schema columnar
- schema columnar_internal
- sequence columnar_internal.storageid_seq
  sequence pg_dist_colocationid_seq
  sequence pg_dist_groupid_seq
  sequence pg_dist_node_nodeid_seq
  sequence pg_dist_placement_placementid_seq
  sequence pg_dist_shardid_seq
- table columnar_internal.chunk
- table columnar_internal.chunk_group
- table columnar_internal.options
- table columnar_internal.stripe
  table pg_dist_authinfo
  table pg_dist_colocation
  table pg_dist_local_group
@@ -279,12 +264,7 @@ ORDER BY 1;
  view citus_shards_on_worker
  view citus_stat_activity
  view citus_stat_statements
- view columnar.chunk
- view columnar.chunk_group
- view columnar.options
- view columnar.storage
- view columnar.stripe
  view pg_dist_shard_placement
  view time_partitions
-(270 rows)
+(250 rows)
 
diff --git a/src/test/regress/sql/columnar_drop.sql b/src/test/regress/sql/columnar_drop.sql
index 23a2826f2..0a2fe7ec6 100644
--- a/src/test/regress/sql/columnar_drop.sql
+++ b/src/test/regress/sql/columnar_drop.sql
@@ -37,15 +37,15 @@ SELECT current_database() datname \gset
 
 CREATE DATABASE db_to_drop;
 \c db_to_drop
-CREATE EXTENSION citus;
+CREATE EXTENSION citus_columnar;
 SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
 
 CREATE TABLE test_table(data int) USING columnar;
 
-DROP EXTENSION citus CASCADE;
+DROP EXTENSION citus_columnar CASCADE;
 
 -- test database drop
-CREATE EXTENSION citus;
+CREATE EXTENSION citus_columnar;
 SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
 
 CREATE TABLE test_table(data int) USING columnar;
diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql
index 0ae3aa9e0..b52c7cb62 100644
--- a/src/test/regress/sql/multi_extension.sql
+++ b/src/test/regress/sql/multi_extension.sql
@@ -98,6 +98,7 @@ ORDER BY 1, 2;
 
 -- DROP EXTENSION pre-created by the regression suite
 DROP EXTENSION citus;
+DROP EXTENSION citus_columnar;
 \c
 
 -- these tests switch between citus versions and call ddl's that require pg_dist_object to be created
@@ -509,6 +510,7 @@ ORDER BY 1, 2;
 RESET citus.enable_version_checks;
 RESET columnar.enable_version_checks;
 DROP EXTENSION citus;
+DROP EXTENSION citus_columnar;
 CREATE EXTENSION citus VERSION '8.0-1';
 
 -- Test non-distributed queries work even in version mismatch
@@ -573,6 +575,7 @@ ALTER EXTENSION citus UPDATE;
 
 -- re-create in newest version
 DROP EXTENSION citus;
+DROP EXTENSION citus_columnar;
 \c
 CREATE EXTENSION citus;
 
@@ -580,6 +583,7 @@ CREATE EXTENSION citus;
 \c - - - :worker_1_port
 
 DROP EXTENSION citus;
+DROP EXTENSION citus_columnar;
 SET citus.enable_version_checks TO 'false';
 SET columnar.enable_version_checks TO 'false';
 CREATE EXTENSION citus VERSION '8.0-1';
diff --git a/src/test/regress/sql/upgrade_columnar_metapage_after.sql b/src/test/regress/sql/upgrade_columnar_metapage_after.sql
index e42c0c8da..d015d0b0d 100644
--- a/src/test/regress/sql/upgrade_columnar_metapage_after.sql
+++ b/src/test/regress/sql/upgrade_columnar_metapage_after.sql
@@ -63,7 +63,7 @@ SELECT version_major, version_minor, reserved_stripe_id, reserved_row_number
   FROM columnar_storage_info('no_data_columnar_table');
 
 -- table is already upgraded, make sure that upgrade_columnar_metapage is no-op
-SELECT citus_internal.upgrade_columnar_storage(c.oid)
+SELECT columnar_internal.upgrade_columnar_storage(c.oid)
 FROM pg_class c, pg_am a
 WHERE c.relam = a.oid AND amname = 'columnar' and relname = 'columnar_table_2';