diff --git a/manifest-generation/config-from-cf-internal.yml b/manifest-generation/config-from-cf-internal.yml
index 18749979d3..04029c6c91 100644
--- a/manifest-generation/config-from-cf-internal.yml
+++ b/manifest-generation/config-from-cf-internal.yml
@@ -19,6 +19,8 @@ config_from_cf:
     server_key: (( properties.consul.server_key ))
   loggregator:
     etcd_machines: (( properties.loggregator.etcd.machines ))
+    etcd_require_ssl: (( properties.loggregator.etcd.require_ssl ))
+    etcd_ca_cert: (( properties.loggregator.etcd.ca_cert ))
     shared_secret: (( properties.loggregator_endpoint.shared_secret ))
     traffic_controller_url: (( "wss://doppler." properties.system_domain ":443" ))
     dropsonde_incoming_port: (( properties.loggregator.dropsonde_incoming_port ))
@@ -34,6 +36,9 @@ config_from_cf:
     tls:
       client_cert: (( properties.metron_agent.tls.client_cert ))
       client_key: (( properties.metron_agent.tls.client_key ))
+    etcd:
+      client_cert: (( properties.metron_agent.etcd.client_cert ))
+      client_key: (( properties.metron_agent.etcd.client_key ))
   nats:
     user: (( properties.nats.user ))
     password: (( properties.nats.password ))
@@ -69,6 +74,8 @@ properties:
     server_key: (( merge ))
   loggregator:
     etcd:
+      ca_cert: null
+      require_ssl: null
       machines: (( merge ))
     dropsonde_incoming_port: (( merge || nil ))
     tls:
@@ -85,6 +92,10 @@ properties:
     tls:
       client_cert: (( merge ))
       client_key: (( merge ))
+    etcd:
+      client_cert: null
+      client_key: null
+
   nats:
     user: (( merge ))
     password: (( merge ))
diff --git a/manifest-generation/config-from-cf.yml b/manifest-generation/config-from-cf.yml
index 6192737699..a4acbea1b0 100644
--- a/manifest-generation/config-from-cf.yml
+++ b/manifest-generation/config-from-cf.yml
@@ -18,6 +18,8 @@ config_from_cf:
     server_cert: (( merge ))
     server_key: (( merge ))
   loggregator:
+    etcd_ca_cert: (( merge ))
+    etcd_require_ssl: (( merge ))
     etcd_machines: (( merge ))
     shared_secret: (( merge ))
     traffic_controller_url: (( merge ))
@@ -33,6 +35,9 @@ config_from_cf:
     tls:
       client_cert: (( merge ))
       client_key: (( merge ))
+    etcd:
+      client_cert: (( merge ))
+      client_key: (( merge ))
 
   metron_endpoint:
     shared_secret: (( merge ))
diff --git a/manifest-generation/diego.yml b/manifest-generation/diego.yml
index a3f91e8042..42d47f50c6 100644
--- a/manifest-generation/diego.yml
+++ b/manifest-generation/diego.yml
@@ -433,9 +433,14 @@ properties:
     tls:
       client_cert: (( config_from_cf.metron_agent.tls.client_cert ))
       client_key: (( config_from_cf.metron_agent.tls.client_key ))
+    etcd:
+      client_cert: (( config_from_cf.metron_agent.etcd.client_cert ))
+      client_key: (( config_from_cf.metron_agent.etcd.client_key ))
     dropsonde_incoming_port: (( config_from_cf.metron_agent.dropsonde_incoming_port ))
   loggregator:
     etcd:
+      require_ssl: (( config_from_cf.loggregator.etcd_require_ssl ))
+      ca_cert: (( config_from_cf.loggregator.etcd_ca_cert ))
       machines: (( config_from_cf.loggregator.etcd_machines ))
     dropsonde_incoming_port: (( config_from_cf.loggregator.dropsonde_incoming_port ))
     tls: