diff --git a/analytics/dsl/export/queries/appointments.sql b/analytics/dsl/export/queries/appointments.sql
index 9d5ecbb..eaf37a1 100644
--- a/analytics/dsl/export/queries/appointments.sql
+++ b/analytics/dsl/export/queries/appointments.sql
@@ -1 +1 @@
-INSERT into appointments SELECT t.*  from analytics.analytics.appointments t
\ No newline at end of file
+INSERT into appointments SELECT t.*  from {ANALYTICS_CATALOG}.analytics.appointments t
diff --git a/analytics/dsl/export/queries/concepts.sql b/analytics/dsl/export/queries/concepts.sql
index 4d85eaf..c8ed122 100644
--- a/analytics/dsl/export/queries/concepts.sql
+++ b/analytics/dsl/export/queries/concepts.sql
@@ -1 +1 @@
-INSERT into concepts SELECT t.*  from  analytics.analytics.concepts t
\ No newline at end of file
+INSERT into concepts SELECT t.*  from  {ANALYTICS_CATALOG}.analytics.concepts t
diff --git a/analytics/dsl/export/queries/conditions.sql b/analytics/dsl/export/queries/conditions.sql
index 7826509..0f39eaa 100644
--- a/analytics/dsl/export/queries/conditions.sql
+++ b/analytics/dsl/export/queries/conditions.sql
@@ -1 +1 @@
-INSERT into conditions SELECT t.*  from  analytics.analytics.conditions t
\ No newline at end of file
+INSERT into conditions SELECT t.*  from  {ANALYTICS_CATALOG}.analytics.conditions t
diff --git a/analytics/dsl/export/queries/encounter_diagnoses.sql b/analytics/dsl/export/queries/encounter_diagnoses.sql
index 21141be..fba8438 100644
--- a/analytics/dsl/export/queries/encounter_diagnoses.sql
+++ b/analytics/dsl/export/queries/encounter_diagnoses.sql
@@ -1 +1 @@
-INSERT into encounter_diagnoses SELECT t.*  from  analytics.analytics.encounter_diagnoses t
\ No newline at end of file
+INSERT into encounter_diagnoses SELECT t.*  from  {ANALYTICS_CATALOG}.analytics.encounter_diagnoses t
diff --git a/analytics/dsl/export/queries/encounters.sql b/analytics/dsl/export/queries/encounters.sql
index 79799cf..e122069 100644
--- a/analytics/dsl/export/queries/encounters.sql
+++ b/analytics/dsl/export/queries/encounters.sql
@@ -1 +1 @@
-INSERT into encounters SELECT t.*  from analytics.analytics.encounters t
\ No newline at end of file
+INSERT into encounters SELECT t.*  from {ANALYTICS_CATALOG}.analytics.encounters t
diff --git a/analytics/dsl/export/queries/observations.sql b/analytics/dsl/export/queries/observations.sql
index 732072e..e576bb2 100644
--- a/analytics/dsl/export/queries/observations.sql
+++ b/analytics/dsl/export/queries/observations.sql
@@ -1 +1 @@
-INSERT into observations SELECT t.*  from analytics.analytics.observations t
\ No newline at end of file
+INSERT into observations SELECT t.*  from {ANALYTICS_CATALOG}.analytics.observations t
diff --git a/analytics/dsl/export/queries/orders.sql b/analytics/dsl/export/queries/orders.sql
index 8b1142b..df5bef2 100644
--- a/analytics/dsl/export/queries/orders.sql
+++ b/analytics/dsl/export/queries/orders.sql
@@ -1 +1 @@
-INSERT into orders SELECT t.*  from  analytics.analytics.orders t
\ No newline at end of file
+INSERT into orders SELECT t.*  from  {ANALYTICS_CATALOG}.analytics.orders t
diff --git a/analytics/dsl/export/queries/patient_programs.sql b/analytics/dsl/export/queries/patient_programs.sql
index fec2967..36b2934 100644
--- a/analytics/dsl/export/queries/patient_programs.sql
+++ b/analytics/dsl/export/queries/patient_programs.sql
@@ -1 +1 @@
-INSERT into patient_programs SELECT t.*  from  analytics.analytics.patient_programs t
\ No newline at end of file
+INSERT into patient_programs SELECT t.*  from  {ANALYTICS_CATALOG}.analytics.patient_programs t
diff --git a/analytics/dsl/export/queries/patients.sql b/analytics/dsl/export/queries/patients.sql
index b23e6ca..7b0b0ed 100644
--- a/analytics/dsl/export/queries/patients.sql
+++ b/analytics/dsl/export/queries/patients.sql
@@ -1 +1 @@
-INSERT into patients SELECT t.*  from analytics.analytics.patients t
\ No newline at end of file
+INSERT into patients SELECT t.*  from {ANALYTICS_CATALOG}.analytics.patients t
diff --git a/analytics/dsl/export/queries/sale_order_lines.sql b/analytics/dsl/export/queries/sale_order_lines.sql
index aef99e7..7f28b1d 100644
--- a/analytics/dsl/export/queries/sale_order_lines.sql
+++ b/analytics/dsl/export/queries/sale_order_lines.sql
@@ -1 +1 @@
-INSERT into sale_order_lines SELECT t.*  from  analytics.analytics.sale_order_lines t
\ No newline at end of file
+INSERT into sale_order_lines SELECT t.*  from  {ANALYTICS_CATALOG}.analytics.sale_order_lines t
diff --git a/analytics/dsl/export/queries/visits.sql b/analytics/dsl/export/queries/visits.sql
index 5acd7cb..b90c92d 100644
--- a/analytics/dsl/export/queries/visits.sql
+++ b/analytics/dsl/export/queries/visits.sql
@@ -1 +1 @@
-INSERT into visits SELECT t.*  from  analytics.analytics.visits t
\ No newline at end of file
+INSERT into visits SELECT t.*  from  {ANALYTICS_CATALOG}.analytics.visits t