diff --git a/de/heat-templates/fragments/NetworkAccVM.yaml b/de/heat-templates/fragments/NetworkAccVM.yaml
index ee7abab..2e1b3f2 100644
--- a/de/heat-templates/fragments/NetworkAccVM.yaml
+++ b/de/heat-templates/fragments/NetworkAccVM.yaml
@@ -13,6 +13,8 @@
     default: []
   tungstenfabric_enabled:
     type: boolean
+  vsrx_enabled:
+    type: boolean
   control_network_ext_router_ip:
     type: string
     default: ''
@@ -21,10 +23,18 @@
     default: ''
 
 conditions:
-  cond_extra_routes:
+  tf:
     equals:
       - get_param: tungstenfabric_enabled
       - true
+  vsrx_deploy:
+    equals:
+      - get_param: vsrx_enabled
+      - true
+  cond_extra_routes:
+    or:
+      - tf
+      - vsrx_deploy
 
 resources:
 
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 0f8a2a9..6a8588b 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -451,7 +451,7 @@
         local type=${1}
         function retry_join_node {
             env -i $(docker swarm join-token $type |grep 'docker swarm join' | xargs)
-            sleep 5 && systemctl restart docker && sleep 5
+            sleep 20 && systemctl restart docker && sleep 20
         }
         retry 10 "Failed to join node to swarm" retry_join_node
     fi
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 5a7dc68..71b3f79 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -446,6 +446,7 @@
       dns_nameservers: { get_param: dns_nameservers }
       control_network_host_routes: { get_param: control_network_host_routes }
       tungstenfabric_enabled: { get_param: tungstenfabric_enabled }
+      vsrx_enabled: { get_param: vsrx_enabled }
       control_network_ext_router_ip: { get_param: control_network_ext_router_ip }
       private_floating_network_cidr: { get_param: private_floating_network_cidr }