diff --git a/.cicd/base-images.yml b/.cicd/base-images.yml
index 604af7be029..cf142664186 100644
--- a/.cicd/base-images.yml
+++ b/.cicd/base-images.yml
@@ -34,6 +34,8 @@ steps:
           no-volume: true
           always-pull: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
           failover-registries:
           - "registry_1"
@@ -99,6 +101,8 @@ steps:
           no-volume: true
           always-pull: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
           failover-registries:
           - "registry_1"
diff --git a/.cicd/build-scripts.yml b/.cicd/build-scripts.yml
index a628c957d75..b3018066b5d 100644
--- a/.cicd/build-scripts.yml
+++ b/.cicd/build-scripts.yml
@@ -40,6 +40,8 @@ steps:
           modify-ram: 24
           always-pull: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
           failover-registries:
           - "registry_1"
@@ -113,6 +115,8 @@ steps:
           modify-ram: 24
           always-pull: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
           failover-registries:
           - "registry_1"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 9df96b23b0f..71f96466de3 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -136,6 +136,8 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           failover-registries:
             - 'registry_1'
             - 'registry_2'
@@ -218,6 +220,8 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           failover-registries:
             - 'registry_1'
             - 'registry_2'
@@ -274,6 +278,8 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           failover-registries:
             - 'registry_1'
             - 'registry_2'
@@ -330,6 +336,8 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           failover-registries:
             - 'registry_1'
             - 'registry_2'
@@ -388,6 +396,8 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           failover-registries:
             - 'registry_1'
             - 'registry_2'
@@ -568,6 +578,8 @@ cat <<EOF
           always-pull: true
           debug: true
           wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
           failover-registries:
             - 'registry_1'
             - 'registry_2'