diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 218f865..94961f7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -183,16 +183,25 @@ jobs:
           set -euo pipefail
 
           REMOTE_TARGET="${GCE_USER}@${GCE_INSTANCE_NAME}"
-          SSH_COMMON_FLAGS=(
+          REMOTE_COMMON_FLAGS=(
             --project "${GCP_PROJECT_ID}"
             --zone "${GCE_ZONE}"
             --quiet
             --tunnel-through-iap
             --ssh-key-file "${SSH_KEY_FILE}"
+          )
+          SSH_FLAGS=(
+            "${REMOTE_COMMON_FLAGS[@]}"
             --ssh-flag="-o ServerAliveInterval=30"
             --ssh-flag="-o ServerAliveCountMax=10"
             --ssh-flag="-o TCPKeepAlive=yes"
           )
+          SCP_FLAGS=(
+            "${REMOTE_COMMON_FLAGS[@]}"
+            --scp-flag="-o ServerAliveInterval=30"
+            --scp-flag="-o ServerAliveCountMax=10"
+            --scp-flag="-o TCPKeepAlive=yes"
+          )
           REMOTE_SYNC_COMMAND=$(cat <<EOF
           set -euo pipefail
           sudo mkdir -p '${DEPLOY_PATH}'
@@ -208,8 +217,8 @@ jobs:
           EOF
           )
 
-          gcloud compute ssh "${REMOTE_TARGET}" "${SSH_COMMON_FLAGS[@]}" --command "${REMOTE_SYNC_COMMAND}"
-          gcloud compute scp "${ENV_FILE}" "${REMOTE_TARGET}:${DEPLOY_PATH}/.env" "${SSH_COMMON_FLAGS[@]}"
+          gcloud compute ssh "${REMOTE_TARGET}" "${SSH_FLAGS[@]}" --command "${REMOTE_SYNC_COMMAND}"
+          gcloud compute scp "${ENV_FILE}" "${REMOTE_TARGET}:${DEPLOY_PATH}/.env" "${SCP_FLAGS[@]}"
 
           REMOTE_DEPLOY_COMMAND=$(cat <<EOF
           set -euo pipefail
@@ -230,4 +239,4 @@ jobs:
           EOF
           )
 
-          gcloud compute ssh "${REMOTE_TARGET}" "${SSH_COMMON_FLAGS[@]}" --command "${REMOTE_DEPLOY_COMMAND}"
+          gcloud compute ssh "${REMOTE_TARGET}" "${SSH_FLAGS[@]}" --command "${REMOTE_DEPLOY_COMMAND}"
diff --git a/tests/test_workflow_shared_config.sh b/tests/test_workflow_shared_config.sh
index cee56c3..1bcbf34 100644
--- a/tests/test_workflow_shared_config.sh
+++ b/tests/test_workflow_shared_config.sh
@@ -25,6 +25,7 @@ grep -Fq 'vars.IB_GATEWAY_TWS_PASSWORD_SECRET_NAME' "$workflow_file"
 grep -Fq 'vars.IB_GATEWAY_TOTP_SECRET_SECRET_NAME' "$workflow_file"
 grep -Fq 'vars.IB_GATEWAY_VNC_SERVER_PASSWORD_SECRET_NAME' "$workflow_file"
 grep -Fq 'gcloud secrets versions access latest' "$workflow_file"
+grep -Fq -- '--scp-flag="-o ServerAliveInterval=30"' "$workflow_file"
 grep -Fq 'resolve_secret()' "$workflow_file"
 grep -Fq 'require_secret_source()' "$workflow_file"
 grep -Fq '"TRADING_MODE": os.environ["IB_GATEWAY_MODE"]' "$workflow_file"