diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index aaae6aebc..159d5262e 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -21,7 +21,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-macos-13-5-amd64
+          type: s1-nonprod-macos-13-5-amd64
       env_vars:
         - name: OS_NAME
           value: osx
@@ -40,7 +40,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-macos-13-5-arm64
+          type: s1-nonprod-macos-13-5-arm64
       env_vars:
         - name: OS_NAME
           value: osx
@@ -61,7 +61,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-ubuntu20-04-arm64-1
+          type: s1-nonprod-ubuntu20-04-arm64-1
       env_vars:
         - name: OS_NAME
           value: linux
@@ -80,7 +80,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-ubuntu20-04-amd64-3
+          type: s1-nonprod-ubuntu20-04-amd64-1
       env_vars:
         - name: OS_NAME
           value: linux
@@ -99,7 +99,7 @@ blocks:
     task:
       agent:
           machine:
-            type: s1-prod-windows
+            type: s1-nonprod-windows
       env_vars:
         - name: OS_NAME
           value: windows
@@ -128,7 +128,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-ubuntu20-04-amd64-2
+          type: s1-nonprod-ubuntu20-04-amd64-1
       env_vars:
         - name: OS_NAME
           value: linux
@@ -150,7 +150,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-ubuntu20-04-arm64-1
+          type: s1-nonprod-ubuntu20-04-arm64-1
       env_vars:
         - name: OS_NAME
           value: linux
@@ -169,7 +169,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-macos-13-5-amd64
+          type: s1-nonprod-macos-13-5-amd64
       env_vars:
         - name: OS_NAME
           value: osx
@@ -188,7 +188,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-macos-13-5-arm64
+          type: s1-nonprod-macos-13-5-arm64
       env_vars:
         - name: OS_NAME
           value: osx
@@ -214,7 +214,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-ubuntu20-04-amd64-3
+          type: s1-nonprod-ubuntu20-04-amd64-1
       jobs:
         - name: "Packaging all artifacts"
           commands: