diff --git a/terraform/gitops/generate-files/templates/mojaloop/values-mojaloop.yaml.tpl b/terraform/gitops/generate-files/templates/mojaloop/values-mojaloop.yaml.tpl
index 4748e7376..cf6c0c3d7 100644
--- a/terraform/gitops/generate-files/templates/mojaloop/values-mojaloop.yaml.tpl
+++ b/terraform/gitops/generate-files/templates/mojaloop/values-mojaloop.yaml.tpl
@@ -111,17 +111,54 @@ CONFIG:
   als_monitoring_prefix: &ALS_MONITORING_PREFIX "${account_lookup_service_monitoring_prefix}"
 
   ## TESTS
-  testCasesZipUrl: &TEST_CASES_ZIP_URL https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
-  test_cases_path_setup: &TEST_CASES_PATH_SETUP testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/provisioning/for_golden_path
-  test_cases_path_gp: &TEST_CASES_PATH_GP testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/golden_path
-  test_cases_path_bulk: &TEST_CASES_PATH_BULK testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/other_tests/bulk_transfers
-  test_cases_path_tp_setup: &TEST_CASES_PATH_TP_SETUP testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/provisioning/for_thirdparty
-  test_cases_path_tp_val: &TEST_CASES_PATH_TP_VAL testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/thirdparty
-  test_cases_path_sdk_bulk_setup: &TEST_CASES_PATH_SDK_BULK_SETUP testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/provisioning/for_sdk_bulk
-  test_cases_path_sdk_bulk_val: &TEST_CASES_PATH_SDK_BULK_VAL testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/sdk_scheme_adapter/bulk/basic
-  test_cases_path_sdk_r2p_val: &TEST_CASES_PATH_SDK_R2P_VAL testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/sdk_scheme_adapter/request-to-pay/basic
-  test_cases_path_cleanup: &TEST_CASES_PATH_CLEANUP testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/cleanup
 
+# %{ if ttk_testcases_tag != null }
+  TEST_CASES_CUSTOM_TAG_SETUP: &TEST_CASES_CUSTOM_TAG_SETUP: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/provisioning/for_golden_path
+
+  TEST_CASES_CUSTOM_TAG_GP: &TEST_CASES_CUSTOM_TAG_GP: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/golden_path
+
+  TEST_CASES_CUSTOM_TAG_BULK: &TEST_CASES_CUSTOM_TAG_BULK: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/other_tests/bulk_transfers
+
+  TEST_CASES_CUSTOM_TAG_TP_SETUP: &TEST_CASES_CUSTOM_TAG_TP_SETUP: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/provisioning/for_thirdparty
+
+  TEST_CASES_CUSTOM_TAG_TP_VAL: &TEST_CASES_CUSTOM_TAG_TP_VAL: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/thirdparty
+
+  TEST_CASES_CUSTOM_TAG_SDK_BULK_SETUP: &TEST_CASES_CUSTOM_TAG_SDK_BULK_SETUP: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/provisioning/for_sdk_bulk
+
+  TEST_CASES_CUSTOM_TAG_SDK_BULK_VAL: &TEST_CASES_CUSTOM_TAG_SDK_BULK_VAL: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/sdk_scheme_adapter/bulk/basic
+
+  TEST_CASES_CUSTOM_TAG_SDK_R2P_VAL: &TEST_CASES_CUSTOM_TAG_SDK_R2P_VAL: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/sdk_scheme_adapter/request-to-pay/basic
+
+  TEST_CASES_CUSTOM_TAG_CLEANUP: &TEST_CASES_CUSTOM_TAG_CLEANUP: 
+    testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v${ttk_testcases_tag}.zip
+    testCasesPathInZip: testing-toolkit-test-cases-${ttk_testcases_tag}/collections/hub/cleanup
+# %{ else }
+  TEST_CASES_CUSTOM_TAG_SETUP: &TEST_CASES_CUSTOM_TAG_SETUP {}
+  TEST_CASES_CUSTOM_TAG_GP: &TEST_CASES_CUSTOM_TAG_GP {}
+  TEST_CASES_CUSTOM_TAG_BULK: &TEST_CASES_CUSTOM_TAG_BULK {}
+  TEST_CASES_CUSTOM_TAG_TP_SETUP: &TEST_CASES_CUSTOM_TAG_TP_SETUP {}
+  TEST_CASES_CUSTOM_TAG_TP_VAL: &TEST_CASES_CUSTOM_TAG_TP_VAL {}
+  TEST_CASES_CUSTOM_TAG_SDK_BULK_SETUP: &TEST_CASES_CUSTOM_TAG_SDK_BULK_SETUP {}
+  TEST_CASES_CUSTOM_TAG_SDK_BULK_VAL: &TEST_CASES_CUSTOM_TAG_SDK_BULK_VAL {}
+  TEST_CASES_CUSTOM_TAG_SDK_R2P_VAL: &TEST_CASES_CUSTOM_TAG_SDK_R2P_VAL {}
+  TEST_CASES_CUSTOM_TAG_CLEANUP: &TEST_CASES_CUSTOM_TAG_CLEANUP {}
+# %{ endif }
 
   ingress_class: &INGRESS_CLASS "${ingress_class_name}"
 
@@ -1104,8 +1141,7 @@ ml-ttk-test-setup:
   configFileDefaults:
     labels: ${ttk_setup_testcase_labels}
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_SETUP
+    <<: *TEST_CASES_CUSTOM_TAG_SETUP
     testSuiteName: Provisioning
     environmentName: ${ingress_subdomain}
     saveReport: true
@@ -1129,8 +1165,7 @@ ml-ttk-test-val-gp:
   tests:
     enabled: true
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_GP
+    <<: *TEST_CASES_CUSTOM_TAG_GP
     testSuiteName: GP Tests
     environmentName: ${ingress_subdomain}
     saveReport: true
@@ -1153,8 +1188,7 @@ ml-ttk-test-val-bulk:
   tests:
     enabled: true
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_BULK
+    <<: *TEST_CASES_CUSTOM_TAG_BULK
     testSuiteName: Bulk Tests
     environmentName: ${ingress_subdomain}
     saveReport: true
@@ -1167,8 +1201,7 @@ ml-ttk-test-setup-tp:
   tests:
     enabled: true
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_TP_SETUP
+    <<: *TEST_CASES_CUSTOM_TAG_TP_SETUP
     testSuiteName: Third Party Provisioning Tests
     environmentName: ${ingress_subdomain}
     saveReport: true
@@ -1181,8 +1214,7 @@ ml-ttk-test-val-tp:
   tests:
     enabled: true
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_TP_VAL
+    <<: *TEST_CASES_CUSTOM_TAG_TP_VAL
     testSuiteName: Third Party Validation Tests
     environmentName: ${ingress_subdomain}
     saveReport: true
@@ -1195,8 +1227,7 @@ ml-ttk-test-setup-sdk-bulk:
   tests:
     enabled: true
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_SDK_BULK_SETUP
+    <<: *TEST_CASES_CUSTOM_TAG_SDK_BULK_SETUP
     testSuiteName: SDK Bulk Provisioning Tests
     environmentName: ${ingress_subdomain}
     saveReport: true
@@ -1209,8 +1240,7 @@ ml-ttk-test-val-sdk-bulk:
   tests:
     enabled: true
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_SDK_BULK_VAL
+    <<: *TEST_CASES_CUSTOM_TAG_SDK_BULK_VAL
     testSuiteName: SDK Bulk Validation Tests
     environmentName: ${ingress_subdomain}
     saveReport: true
@@ -1223,8 +1253,7 @@ ml-ttk-test-val-sdk-r2p:
   tests:
     enabled: true
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_SDK_R2P_VAL
+    <<: *TEST_CASES_CUSTOM_TAG_SDK_R2P_VAL
     testSuiteName: SDK Request To Pay Tests
     environmentName: ${ingress_subdomain}
     saveReport: true
@@ -1237,8 +1266,7 @@ ml-ttk-test-cleanup:
   tests:
     enabled: true
   config:
-    testCasesZipUrl: *TEST_CASES_ZIP_URL
-    testCasesPathInZip: *TEST_CASES_PATH_CLEANUP
+    <<: *TEST_CASES_CUSTOM_TAG_CLEANUP
     testSuiteName: Post Cleanup
     environmentName: ${ingress_subdomain}
     saveReport: true