diff --git a/base.yml b/base.yml
index 91eacc8..493469c 100644
--- a/base.yml
+++ b/base.yml
@@ -4,8 +4,12 @@ networks:
   frontend:
     driver: overlay
     attachable: true
+    driver_opts:
+      encrypted: "true" 
   cache:
     driver: overlay
+    driver_opts:
+      encrypted: "true"
 
 secrets:
   cf_op:
diff --git a/build/HAProxy/haproxy.conf b/build/HAProxy/haproxy.conf
index 2551e6b..245272c 100644
--- a/build/HAProxy/haproxy.conf
+++ b/build/HAProxy/haproxy.conf
@@ -23,14 +23,13 @@ defaults
 
 resolvers dockerdns
   nameserver docker 127.0.0.11:53
-  nameserver cf 1.1.1.1:53
   resolve_retries 2
   timeout retry 300ms
-  hold other           30s
-  hold refused         30s
-  hold nx              30s
-  hold timeout         30s
-  hold valid           10s
+  hold other           100ms
+  hold refused         100ms
+  hold nx              100ms
+  hold timeout         3s
+  hold valid           1s
 
 frontend https
   mode http