diff --git a/manifest-generation/cf-mysql-template.yml b/manifest-generation/cf-mysql-template.yml
index 3ef1c08b..65cd83f1 100644
--- a/manifest-generation/cf-mysql-template.yml
+++ b/manifest-generation/cf-mysql-template.yml
@@ -120,6 +120,10 @@ properties:
       smoke_tests_only: (( property_overrides.acceptance_tests.smoke_tests_only || nil ))
       standalone_tests_only: (( property_overrides.acceptance_tests.standalone_tests_only || nil ))
       timeout_scale: (( property_overrides.acceptance_tests.timeout_scale || nil ))
+      admin_user: (( config_from_cf.acceptance_tests.admin_user ))
+      admin_password: (( config_from_cf.acceptance_tests.admin_password ))
+      api: (( config_from_cf.acceptance_tests.api ))
+      app_domains: (( config_from_cf.acceptance_tests.app_domains ))
   cf-mysql-backup: (( property_overrides.cf-mysql-backup || nil ))
   service-backup: (( property_overrides.service-backup || nil ))
 
diff --git a/manifest-generation/misc-templates/config-from-cf-internal.yml b/manifest-generation/misc-templates/config-from-cf-internal.yml
index 6c34e246..93f845a2 100644
--- a/manifest-generation/misc-templates/config-from-cf-internal.yml
+++ b/manifest-generation/misc-templates/config-from-cf-internal.yml
@@ -16,6 +16,11 @@ config_from_cf:
   smoke_tests:
     use_existing_org: (( properties.smoke_tests.use_existing_org ))
     org: (( properties.smoke_tests.org ))
+  acceptance_tests:
+    admin_user: (( config_from_cf.admin_username ))
+    admin_password: (( config_from_cf.admin_password ))
+    api: (( config_from_cf.api_url ))
+    app_domains: (( config_from_cf.app_domains ))
 
 # The keys below should not be included in the final stub
 name: (( merge ))
diff --git a/manifest-generation/misc-templates/config-from-cf.yml b/manifest-generation/misc-templates/config-from-cf.yml
index a7414a53..00f51245 100644
--- a/manifest-generation/misc-templates/config-from-cf.yml
+++ b/manifest-generation/misc-templates/config-from-cf.yml
@@ -16,3 +16,8 @@ config_from_cf:
   smoke_tests:
     use_existing_org: (( merge ))
     org: (( merge ))
+  acceptance_tests:
+    admin_user: (( merge ))
+    admin_password: (( merge ))
+    api: (( merge ))
+    app_domains: (( merge ))