diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cff39bf51..73ccb3272 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,8 +43,6 @@ that are missing in earlier minor versions.
   ./configure
   make
   make install
-  # Optionally, you might instead want to use `make install-all`
-  # since `multi_extension` regression test would fail due to missing downgrade scripts.
   cd src/test/regress
 
   pip install pipenv
@@ -81,8 +79,6 @@ that are missing in earlier minor versions.
   ./configure
   make
   sudo make install
-  # Optionally, you might instead want to use `sudo make install-all`
-  # since `multi_extension` regression test would fail due to missing downgrade scripts.
   cd src/test/regress
 
   pip install pipenv
@@ -131,8 +127,6 @@ that are missing in earlier minor versions.
   PG_CONFIG=/usr/pgsql-14/bin/pg_config ./configure
   make
   sudo make install
-  # Optionally, you might instead want to use `sudo make install-all`
-  # since `multi_extension` regression test would fail due to missing downgrade scripts.
   cd src/test/regress
 
   pip install pipenv
diff --git a/Makefile b/Makefile
index 12b26cbbe..5b5f46c42 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,6 @@ clean-full:
 
 install-downgrades:
 	$(MAKE) -C src/backend/distributed/ install-downgrades
-install-all: install-headers install-pg_send_cancellation
-	$(MAKE) -C src/backend/columnar/ install-all
-	$(MAKE) -C src/backend/distributed/ install-all
 
 # build citus_send_cancellation binary
 pg_send_cancellation:
@@ -64,8 +61,7 @@ check-style:
 	cd ${citus_abs_top_srcdir} && citus_indent --quiet --check
 .PHONY: reindent check-style
 
-# depend on install-all so that downgrade scripts are installed as well
-check: all install-all
+check: all
 	$(MAKE) -C src/test/regress check-full
 
-.PHONY: all check clean install install-downgrades install-all
+.PHONY: all check clean install install-downgrades
diff --git a/ci/build-citus.sh b/ci/build-citus.sh
index 49f92e691..ca41e1ae6 100755
--- a/ci/build-citus.sh
+++ b/ci/build-citus.sh
@@ -36,7 +36,7 @@ build_ext() {
   CFLAGS=-Werror "${basedir}/configure" PG_CONFIG="/usr/lib/postgresql/${pg_major}/bin/pg_config" --enable-coverage --with-security-flags
 
   installdir="${builddir}/install"
-  make -j$(nproc) && mkdir -p "${installdir}" && { make DESTDIR="${installdir}" install-all || make DESTDIR="${installdir}" install ; }
+  make -j$(nproc) && mkdir -p "${installdir}" && make DESTDIR="${installdir}" install
 
   cd "${installdir}" && find . -type f -print > "${builddir}/files.lst"
   tar cvf "${basedir}/install-${pg_major}.tar" `cat ${builddir}/files.lst`
diff --git a/src/backend/columnar/Makefile b/src/backend/columnar/Makefile
index f9fa09b7c..b097b48b0 100644
--- a/src/backend/columnar/Makefile
+++ b/src/backend/columnar/Makefile
@@ -18,6 +18,3 @@ DATA = $(columnar_sql_files) \
 PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include
 
 include $(citus_top_builddir)/Makefile.global
-
-.PHONY: install-all
-install-all: install
diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile
index a51c2a1f5..1f7b17a89 100644
--- a/src/backend/distributed/Makefile
+++ b/src/backend/distributed/Makefile
@@ -79,16 +79,14 @@ ifneq (,$(SQL_Po_files))
 include $(SQL_Po_files)
 endif
 
-.PHONY: clean-full install install-downgrades install-all
+.PHONY: clean-full install install-downgrades
 
 cleanup-before-install:
 	rm -f $(DESTDIR)$(datadir)/$(datamoduledir)/citus.control
 	rm -f $(DESTDIR)$(datadir)/$(datamoduledir)/citus--*
 
+# install downgrades after cleanup is over
 install: cleanup-before-install
-
-# install and install-downgrades should be run sequentially
-install-all: install
 	$(MAKE) install-downgrades
 
 install-downgrades: $(generated_downgrade_sql_files)
diff --git a/src/backend/distributed/sql/citus--10.2-5--10.2-4.sql b/src/backend/distributed/sql/citus--10.2-5--10.2-4.sql
deleted file mode 100644
index 3082344ba..000000000
--- a/src/backend/distributed/sql/citus--10.2-5--10.2-4.sql
+++ /dev/null
@@ -1 +0,0 @@
-#include "udfs/citus_finish_pg_upgrade/10.2-4.sql"
diff --git a/src/backend/distributed/sql/citus--11.0-4--11.0-3.sql b/src/backend/distributed/sql/citus--11.0-4--11.0-3.sql
deleted file mode 100644
index e16edaa77..000000000
--- a/src/backend/distributed/sql/citus--11.0-4--11.0-3.sql
+++ /dev/null
@@ -1 +0,0 @@
-#include "udfs/citus_finish_pg_upgrade/11.0-1.sql"
diff --git a/src/backend/distributed/sql/downgrades/citus--10.2-5--10.2-4.sql b/src/backend/distributed/sql/downgrades/citus--10.2-5--10.2-4.sql
new file mode 100644
index 000000000..4eb4662db
--- /dev/null
+++ b/src/backend/distributed/sql/downgrades/citus--10.2-5--10.2-4.sql
@@ -0,0 +1 @@
+#include "../udfs/citus_finish_pg_upgrade/10.2-4.sql"
diff --git a/src/backend/distributed/sql/downgrades/citus--11.0-4--11.0-3.sql b/src/backend/distributed/sql/downgrades/citus--11.0-4--11.0-3.sql
new file mode 100644
index 000000000..0aea9615a
--- /dev/null
+++ b/src/backend/distributed/sql/downgrades/citus--11.0-4--11.0-3.sql
@@ -0,0 +1 @@
+#include "../udfs/citus_finish_pg_upgrade/11.0-1.sql"
diff --git a/src/backend/distributed/sql/citus--9.3-1--9.2-4.sql b/src/backend/distributed/sql/downgrades/citus--9.3-1--9.2-4.sql
similarity index 100%
rename from src/backend/distributed/sql/citus--9.3-1--9.2-4.sql
rename to src/backend/distributed/sql/downgrades/citus--9.3-1--9.2-4.sql
diff --git a/src/backend/distributed/sql/citus--9.4-2--9.4-1.sql b/src/backend/distributed/sql/downgrades/citus--9.4-2--9.4-1.sql
similarity index 100%
rename from src/backend/distributed/sql/citus--9.4-2--9.4-1.sql
rename to src/backend/distributed/sql/downgrades/citus--9.4-2--9.4-1.sql
diff --git a/src/backend/distributed/sql/citus--9.4-3--9.4-2.sql b/src/backend/distributed/sql/downgrades/citus--9.4-3--9.4-2.sql
similarity index 100%
rename from src/backend/distributed/sql/citus--9.4-3--9.4-2.sql
rename to src/backend/distributed/sql/downgrades/citus--9.4-3--9.4-2.sql
diff --git a/src/backend/distributed/sql/citus--9.5-2--9.5-1.sql b/src/backend/distributed/sql/downgrades/citus--9.5-2--9.5-1.sql
similarity index 100%
rename from src/backend/distributed/sql/citus--9.5-2--9.5-1.sql
rename to src/backend/distributed/sql/downgrades/citus--9.5-2--9.5-1.sql
diff --git a/src/backend/distributed/sql/citus--9.5-3--9.5-2.sql b/src/backend/distributed/sql/downgrades/citus--9.5-3--9.5-2.sql
similarity index 100%
rename from src/backend/distributed/sql/citus--9.5-3--9.5-2.sql
rename to src/backend/distributed/sql/downgrades/citus--9.5-3--9.5-2.sql