diff --git a/.github/workflows/publish-hotfix.yml b/.github/workflows/publish-hotfix.yml
index 80ccdbc2fc2..7f1646ae7e4 100644
--- a/.github/workflows/publish-hotfix.yml
+++ b/.github/workflows/publish-hotfix.yml
@@ -84,16 +84,26 @@ jobs:
         working-directory: ./canary
 
   build-test-v2:
-    uses: ./.github/workflows/reusable-build-system-test.yml
+    runs-on: ubuntu-latest
     needs: publish-hotfix
-    with:
-      dist-tag: hotfix
+    environment: ci
+    if: ${{ needs.setup.outputs.has-changesets != 'true' }}
+    steps:
+      - name: Build test v2
+        uses: ./.github/workflows/reusable-build-system-test.yml
+        with:
+          dist-tag: hotfix
 
   build-test-v2-react-native:
-    uses: ./.github/workflows/reusable-build-system-test-react-native.yml
+    runs-on: ubuntu-latest
     needs: publish-hotfix
-    with:
-      dist-tag: hotfix
+    environment: ci
+    if: ${{ needs.setup.outputs.has-changesets != 'true' }}
+    steps:
+      - name: Build test v2 React Native
+        uses: ./.github/workflows/reusable-build-system-test-react-native.yml
+        with:
+          dist-tag: hotfix
 
   publish:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/publish-latest.yml b/.github/workflows/publish-latest.yml
index fc629a39e67..8f3f7e5d1ef 100644
--- a/.github/workflows/publish-latest.yml
+++ b/.github/workflows/publish-latest.yml
@@ -83,16 +83,26 @@ jobs:
         working-directory: ./canary
 
   build-test-v2:
-    uses: ./.github/workflows/reusable-build-system-test.yml
     needs: setup
-    with:
-      dist-tag: next
+    environment: ci
+    if: ${{ needs.setup.outputs.has-changesets != 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build test v2
+        uses: ./.github/workflows/reusable-build-system-test.yml
+        with:
+          dist-tag: next
 
   build-test-v2-react-native:
-    uses: ./.github/workflows/reusable-build-system-test-react-native.yml
     needs: setup
-    with:
-      dist-tag: next
+    environment: ci
+    if: ${{ needs.setup.outputs.has-changesets != 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build test v2 React Native
+        uses: ./.github/workflows/reusable-build-system-test-react-native.yml
+        with:
+          dist-tag: next
 
   publish:
     runs-on: ubuntu-latest