diff --git a/tools/deployment/seaworthy-virt/airship_gate/lib/config.sh b/tools/deployment/seaworthy-virt/airship_gate/lib/config.sh
index 0317794a3..2044ddf49 100644
--- a/tools/deployment/seaworthy-virt/airship_gate/lib/config.sh
+++ b/tools/deployment/seaworthy-virt/airship_gate/lib/config.sh
@@ -29,6 +29,8 @@ export NTP_SERVERS=${NTP_SERVERS:-""}
 export PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY:-MjI1N2ZiMjMzYjI0ZmVkZDU4}
 export PEGLEG_PASSPHRASE=${PEGLEG_PASSPHRASE:-ewd?egnPWL0Q?hzzGwEBmII5}
 export PEGLEG_SALT=${PEGLEG_SALT:-9EX&uapdz1ka17WOQMG-FjTA}
+export SHIPYARD_DEPLOY_TIMEOUT=${SHIPYARD_DEPLOY_TIMEOUT:-"7600"}
+export SHIPYARD_UPDATE_TIMEOUT=${SHIPYARD_UPDATE_TIMEOUT:-"1800"}
 
 # key-pair used for drydock/maas auth towards libvirt and access to
 # the virtual nodes; auto-generated if no value provided
diff --git a/tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-deploy-site.sh b/tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-deploy-site.sh
index 365d393af..6fe9e721d 100755
--- a/tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-deploy-site.sh
+++ b/tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-deploy-site.sh
@@ -19,4 +19,4 @@ source "${GATE_UTILS}"
 
 cd "${TEMP_DIR}"
 
-shipyard_action_wait deploy_site 7200
+shipyard_action_wait deploy_site "${SHIPYARD_DEPLOY_TIMEOUT}"
diff --git a/tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-update-site.sh b/tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-update-site.sh
index 6b4d1621c..26490b073 100755
--- a/tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-update-site.sh
+++ b/tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-update-site.sh
@@ -19,4 +19,4 @@ source "${GATE_UTILS}"
 
 cd "${TEMP_DIR}"
 
-shipyard_action_wait update_site 1800
+shipyard_action_wait update_site "${SHIPYARD_UPDATE_TIMEOUT}"