diff --git a/src/backend/columnar/Makefile b/src/backend/columnar/Makefile
index c18b88424..bf17b98bf 100644
--- a/src/backend/columnar/Makefile
+++ b/src/backend/columnar/Makefile
@@ -10,11 +10,10 @@ OBJS += \
 MODULE_big = citus_columnar
 EXTENSION = citus_columnar
 
-template_sql_files = $(patsubst $(citus_abs_srcdir)/%,%,$(wildcard $(citus_abs_srcdir)/sql/*.sql))
-
-#DATA = $(wildcard sql/*--*.sql) 
-#		$(wildcard sql/downgrades/*--*.sql)
-DATA = $(template_sql_files)
+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