diff --git a/rpc_deployment/inventory/group_vars/all.yml b/rpc_deployment/inventory/group_vars/all.yml
index e6f869164e..6e240ab08f 100644
--- a/rpc_deployment/inventory/group_vars/all.yml
+++ b/rpc_deployment/inventory/group_vars/all.yml
@@ -189,3 +189,6 @@ logstash_port: 5544
 
 # Directory where serverspec is installed to on utility container
 serverspec_install_dir: /opt/serverspec
+
+# How long to wait for a container after a (re)start
+container_start_timeout: 180
diff --git a/rpc_deployment/roles/container_common/tasks/add_interfaces.yml b/rpc_deployment/roles/container_common/tasks/add_interfaces.yml
index da902af7ae..5d20f18f31 100644
--- a/rpc_deployment/roles/container_common/tasks/add_interfaces.yml
+++ b/rpc_deployment/roles/container_common/tasks/add_interfaces.yml
@@ -34,7 +34,7 @@
 - name: Wait for container networking
   wait_for: >
     port=22
-    timeout=60
+    timeout={{ container_start_timeout }}
     search_regex=OpenSSH
     host={{ container_address }}
   when: restarted_container|changed and is_metal != true
diff --git a/rpc_deployment/roles/container_extra_setup/tasks/container_setup.yml b/rpc_deployment/roles/container_extra_setup/tasks/container_setup.yml
index 299e73ba32..e31d33c2fa 100644
--- a/rpc_deployment/roles/container_extra_setup/tasks/container_setup.yml
+++ b/rpc_deployment/roles/container_extra_setup/tasks/container_setup.yml
@@ -44,7 +44,7 @@
   wait_for:
     port: "22"
     search_regex: "OpenSSH"
-    timeout: "60"
+    timeout: "{{ container_start_timeout }}"
     host: "{{ container_address }}"
   delegate_to: localhost
   when: inner_extra_changed|changed or local_extra_changed|changed or config_extra_changed|changed
diff --git a/rpc_deployment/roles/container_restart/tasks/main.yml b/rpc_deployment/roles/container_restart/tasks/main.yml
index 922f386252..ddcabba15f 100644
--- a/rpc_deployment/roles/container_restart/tasks/main.yml
+++ b/rpc_deployment/roles/container_restart/tasks/main.yml
@@ -34,7 +34,7 @@
 - name: Check Networking After Restart
   wait_for: >
     port=22
-    timeout=60
+    timeout={{ container_start_timeout }}
     search_regex=OpenSSH
     host={{ hostvars[item]['container_address'] }}
   with_items: container_groups
diff --git a/rpc_deployment/roles/neutron_add_network_interfaces/tasks/main.yml b/rpc_deployment/roles/neutron_add_network_interfaces/tasks/main.yml
index 2a1cc4ecd8..a9726a6a54 100644
--- a/rpc_deployment/roles/neutron_add_network_interfaces/tasks/main.yml
+++ b/rpc_deployment/roles/neutron_add_network_interfaces/tasks/main.yml
@@ -34,7 +34,7 @@
 - name: Wait for container networking
   wait_for: >
     port=22
-    timeout=60
+    timeout={{ container_start_timeout }}
     search_regex=OpenSSH
     host={{ container_address }}
   when: restarted_container|changed and is_metal != true