diff --git a/manifest-generation/bosh-lite-stubs/acceptance-tests-properties.yml b/manifest-generation/bosh-lite-stubs/acceptance-tests-properties.yml
new file mode 100644
index 0000000000..cf0ca71212
--- /dev/null
+++ b/manifest-generation/bosh-lite-stubs/acceptance-tests-properties.yml
@@ -0,0 +1,8 @@
+---
+acceptance_tests_properties:
+  api: api.bosh-lite.com
+  apps_domain: bosh-lite.com
+  admin_user: admin
+  admin_password: admin
+  secure_address: 10.244.0.42:4001
+  skip_cert_verify: true
diff --git a/manifest-generation/bosh-lite-stubs/smoke-tests-properties.yml b/manifest-generation/bosh-lite-stubs/smoke-tests-properties.yml
new file mode 100644
index 0000000000..9092cf4500
--- /dev/null
+++ b/manifest-generation/bosh-lite-stubs/smoke-tests-properties.yml
@@ -0,0 +1,9 @@
+---
+smoke_tests_properties:
+  api: api.bosh-lite.com
+  apps_domain: bosh-lite.com
+  org: smoke-tests
+  space: tests
+  user: admin
+  password: admin
+  skip_cert_verify: true
\ No newline at end of file
diff --git a/manifest-generation/bosh-lite-stubs/diego-acceptance-tests.yml b/manifest-generation/diego-acceptance-tests.yml
similarity index 72%
rename from manifest-generation/bosh-lite-stubs/diego-acceptance-tests.yml
rename to manifest-generation/diego-acceptance-tests.yml
index cb311aebec..9969c37eea 100644
--- a/manifest-generation/bosh-lite-stubs/diego-acceptance-tests.yml
+++ b/manifest-generation/diego-acceptance-tests.yml
@@ -38,13 +38,14 @@ jobs:
   resource_pool: errand
 properties:
   acceptance_tests:
-    admin_password: admin
-    admin_user: admin
-    api: api.bosh-lite.com
-    apps_domain: bosh-lite.com
-    secure_address: 10.244.0.42:4001
-    skip_ssl_validation: true
+    api: (( acceptance_tests_properties.api ))
+    apps_domain: (( acceptance_tests_properties.apps_domain ))
+    admin_user: (( acceptance_tests_properties.admin_user ))
+    admin_password: (( acceptance_tests_properties.admin_password ))
+    secure_address: (( acceptance_tests_properties.secure_address ))
+    skip_ssl_validation: (( acceptance_tests_properties.skip_cert_verify ))
 
 # The keys below should not be included in the final stub
 config_from_cf: (( merge ))
 iaas_settings: (( merge ))
+acceptance_tests_properties: (( merge ))
diff --git a/manifest-generation/benchmark-errand-stubs/benchmarks.yml b/manifest-generation/diego-benchmarks.yml
similarity index 100%
rename from manifest-generation/benchmark-errand-stubs/benchmarks.yml
rename to manifest-generation/diego-benchmarks.yml
diff --git a/manifest-generation/bosh-lite-stubs/diego-smoke-tests.yml b/manifest-generation/diego-smoke-tests.yml
similarity index 73%
rename from manifest-generation/bosh-lite-stubs/diego-smoke-tests.yml
rename to manifest-generation/diego-smoke-tests.yml
index 51387c53d9..ab2139e3cc 100644
--- a/manifest-generation/bosh-lite-stubs/diego-smoke-tests.yml
+++ b/manifest-generation/diego-smoke-tests.yml
@@ -38,16 +38,17 @@ jobs:
   resource_pool: errand
 properties:
   diego:
-    ssl:
-      skip_cert_verify: true
     smoke_tests:
-      api: api.bosh-lite.com
-      org: smoke-tests
-      password: admin
-      space: tests
-      user: admin
-      apps_domain: bosh-lite.com
+      api: (( smoke_tests_properties.api ))
+      apps_domain: (( smoke_tests_properties.apps_domain ))
+      org: (( smoke_tests_properties.org ))
+      space: (( smoke_tests_properties.space ))
+      user: (( smoke_tests_properties.user ))
+      password: (( smoke_tests_properties.password ))
+    ssl:
+      skip_cert_verify: (( smoke_tests_properties.skip_cert_verify ))
 
 # The keys below should not be included in the final stub
 config_from_cf: (( merge ))
 iaas_settings: (( merge ))
+smoke_tests_properties: (( merge ))
diff --git a/scripts/generate-benchmarks-manifest b/scripts/generate-benchmarks-manifest
index 0a272c50e8..5524b26a83 100755
--- a/scripts/generate-benchmarks-manifest
+++ b/scripts/generate-benchmarks-manifest
@@ -20,7 +20,8 @@ Copy one of the default_benchmark_properties files from manifest-generation/benc
   exit 1
 }
 
-benchmark_stub=$(dirname $0)/../manifest-generation/benchmark-errand-stubs/benchmarks.yml
+benchmark_template=$(dirname $0)/../manifest-generation/diego-benchmarks.yml
+bosh_template=$(dirname $0)/../manifest-generation/misc-templates/bosh.yml
 diego_properties=$(dirname $0)/../manifest-generation/benchmark-errand-stubs/diego-properties.yml
 tmpdir=$(mktemp -d /tmp/benchmark-manifest.XXXXX)
 diego_yml=$1
@@ -43,5 +44,17 @@ if [ ! -f "${iaas_settings}" ]; then
   usage
 fi
 
-spiff merge ${diego_properties} ${diego_yml} > ${tmpdir}/diego_properties.yml 
-spiff merge ${benchmark_stub} ${tmpdir}/diego_properties.yml ${benchmark_properties} ${iaas_settings}
+spiff merge \
+  ${diego_properties} \
+  ${diego_yml} \
+  > ${tmpdir}/diego_properties.yml 
+spiff merge \
+  ${benchmark_template} \
+  ${tmpdir}/diego_properties.yml \
+  ${benchmark_properties} \
+  ${iaas_settings} \
+  > ${tmpdir}/diego-benchmarks.yml
+spiff merge \
+  ${bosh_template} \
+  ${tmpdir}/diego-benchmarks.yml
+  
diff --git a/scripts/generate-bosh-lite-manifests b/scripts/generate-bosh-lite-manifests
index de60f11cfb..4eb655d41f 100755
--- a/scripts/generate-bosh-lite-manifests
+++ b/scripts/generate-bosh-lite-manifests
@@ -27,15 +27,27 @@ $scripts_path/generate-deployment-manifest \
       > ${tmpdir}/config-from-cf.yml
 
     spiff merge \
-      manifest-generation/bosh-lite-stubs/diego-acceptance-tests.yml \
+      manifest-generation/diego-acceptance-tests.yml \
       manifest-generation/bosh-lite-stubs/iaas-settings.yml \
       ${tmpdir}/config-from-cf.yml \
+      manifest-generation/bosh-lite-stubs/acceptance-tests-properties.yml \
+      > ${tmpdir}/diego-acceptance-tests.yml
+
+    spiff merge \
+      manifest-generation/misc-templates/bosh.yml \
+      ${tmpdir}/diego-acceptance-tests.yml \
       > ${DIEGO_MANIFESTS_DIR}/diego-acceptance-tests.yml
 
     spiff merge \
-      manifest-generation/bosh-lite-stubs/diego-smoke-tests.yml \
+      manifest-generation/diego-smoke-tests.yml \
       manifest-generation/bosh-lite-stubs/iaas-settings.yml \
       ${tmpdir}/config-from-cf.yml \
+      manifest-generation/bosh-lite-stubs/smoke-tests-properties.yml \
+      > ${tmpdir}/diego-smoke-tests.yml
+
+    spiff merge \
+      manifest-generation/misc-templates/bosh.yml \
+      ${tmpdir}/diego-smoke-tests.yml \
       > ${DIEGO_MANIFESTS_DIR}/diego-smoke-tests.yml
 
     $scripts_path/generate-benchmarks-manifest \