diff --git a/.buildkite/steps/buildimages.sh b/.buildkite/steps/buildimages.sh
index dde48fc51..5ff2b6753 100755
--- a/.buildkite/steps/buildimages.sh
+++ b/.buildkite/steps/buildimages.sh
@@ -37,4 +37,13 @@ cat << EOF
 EOF
 fi
   done
-done
\ No newline at end of file
+done
+cat << EOF
+
+  - wait
+
+  - label: ":vertical_traffic_light: Build Concurrency Gate"
+    command: "echo End of concurrency gate"
+    concurrency: 3
+    concurrency_group: "builds"
+EOF
\ No newline at end of file
diff --git a/.buildkite/steps/e2etests.sh b/.buildkite/steps/e2etests.sh
index 6c7ee297d..b6085dbea 100755
--- a/.buildkite/steps/e2etests.sh
+++ b/.buildkite/steps/e2etests.sh
@@ -24,4 +24,13 @@ cat << EOF
       suite: "all"
 EOF
 fi
-done
\ No newline at end of file
+done
+cat << EOF
+
+  - wait
+
+  - label: ":vertical_traffic_light: Test Concurrency Gate"
+    command: "echo End of concurrency gate"
+    concurrency: 3
+    concurrency_group: "tests"
+EOF
\ No newline at end of file