diff --git a/cf-deployment.yml b/cf-deployment.yml
index 3aef5dc8f..4ff26bd5d 100644
--- a/cf-deployment.yml
+++ b/cf-deployment.yml
@@ -377,21 +377,6 @@ instance_groups:
   networks:
   - name: default
   jobs:
-  - name: nats
-    release: nats
-    provides:
-      nats: {as: nats, shared: true}
-    properties:
-      nats:
-        hostname: nats.service.cf.internal
-        user: nats
-        password: "((nats_password))"
-        internal:
-          tls:
-            ca: "((nats_internal_cert.ca))"
-            certificate: "((nats_internal_cert.certificate))"
-            enabled: true
-            private_key: "((nats_internal_cert.private_key))"
   - name: nats-tls
     release: nats
     provides:
@@ -1264,6 +1249,10 @@ instance_groups:
           ca: ((cf_app_sd_server_tls.ca))
         server:
           tls: ((cf_app_sd_server_tls))
+      nats:
+        tls_enabled: true
+        cert_chain: ((nats_client_cert.certificate))
+        private_key: ((nats_client_cert.private_key))
     release: cf-networking
   - name: statsd_injector
     release: statsd-injector
@@ -1620,11 +1609,6 @@ instance_groups:
       tls: *cfdot_tls_client_properties
   - name: route_emitter
     release: diego
-    consumes:
-      nats:
-        ip_addresses: false
-      nats-tls:
-        ip_addresses: false
     properties:
       bpm:
         enabled: true