diff --git a/.github/workflows/build-push-containers-all.yml b/.github/workflows/build-push-containers-all.yml
index b29e0e20e..3cdfe8eb1 100644
--- a/.github/workflows/build-push-containers-all.yml
+++ b/.github/workflows/build-push-containers-all.yml
@@ -8,13 +8,25 @@ on:
       - opened
       - synchronize
   push:
-    branches:
-      - '**' 
     tags:
       - '[0-9]*.[0-9]*.[0-9]*'
 
 jobs:
+
+  read-github-context-object:
+    runs-on: ubuntu-latest
+    steps:
+      # I know this is not pretty (debug information) but it's useful to have this
+    - name: Read github context
+      env: 
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: |
+        echo "GITHUB_SHA=${GITHUB_SHA}"
+        echo "INFO: github context object content below"
+        echo "${GITHUB_CONTEXT}"
+
   build-push-checked-containers:
+    if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') ||  github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
     uses: ./.github/workflows/build-push-container.yml
     name: Build Push Checked Containers
     secrets: inherit
@@ -36,6 +48,7 @@ jobs:
       container_name: ${{ matrix.container_name }}
 
   build-push-checked-manifest:
+    if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') ||  github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
     uses: ./.github/workflows/build-push-manifest.yml
     name: Build Push Checked Manifest
     needs: 
@@ -60,7 +73,7 @@ jobs:
 
   container-checks:
     if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') ||  github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
-    runs-on: buildjet-8vcpu-ubuntu-2204
+    runs-on: buildjet-16vcpu-ubuntu-2204
     needs: 
       - build-push-checked-manifest
     steps:
@@ -110,6 +123,8 @@ jobs:
 ### Unchecked containers
 
   build-push-unchecked-containers:
+    if: contains(github.event.pull_request.labels.*.name, 'cicd:bridge-containers') ||  github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:bridge-containers'
+
     uses: ./.github/workflows/build-push-container.yml
     name: Build Push Unchecked Containers
     secrets: inherit
diff --git a/.github/workflows/checks-all.yml b/.github/workflows/checks-all.yml
index 14b8f9bd9..294f8d886 100755
--- a/.github/workflows/checks-all.yml
+++ b/.github/workflows/checks-all.yml
@@ -7,25 +7,38 @@ on:
       - opened
       - synchronize
   push:
-    branches:
-      - '**' 
+    tags:
+      - '[0-9]*.[0-9]*.[0-9]*'
 
 jobs:
- 
+
+  read-github-context-object:
+    runs-on: ubuntu-latest
+    steps:
+      # I know this is not pretty (debug information) but it's useful to have this
+    - name: Read github context
+      env: 
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: |
+        echo "GITHUB_SHA=${GITHUB_SHA}"
+        echo "INFO: github context object content below"
+        echo "${GITHUB_CONTEXT}"
+
   build:
     strategy:
       matrix:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
-          - os: macos-13-latest
+            runs-on: buildjet-16vcpu-ubuntu-2204
+          - os: macos-15
             arch: arm64
-            runs-on: macos-13-xlarge
+            runs-on: macos-15
 
     runs-on: ${{ matrix.runs-on }}
 
     steps:
+
     - name: Checkout repository
       uses: actions/checkout@v4
 
@@ -42,10 +55,10 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
-          - os: macos-13-latest
+            runs-on: buildjet-16vcpu-ubuntu-2204
+          - os: macos-15
             arch: arm64
-            runs-on: macos-13-xlarge
+            runs-on: macos-15
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -183,7 +196,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
+            runs-on: buildjet-16vcpu-ubuntu-2204
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -239,7 +252,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
+            runs-on: buildjet-16vcpu-ubuntu-2204
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -317,7 +330,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
+            runs-on: buildjet-16vcpu-ubuntu-2204
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -372,7 +385,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
+            runs-on: buildjet-16vcpu-ubuntu-2204
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -444,7 +457,7 @@ jobs:
 #        include:
 #          - os: ubuntu-22.04
 #            arch: x86_64
-#            runs-on: buildjet-8vcpu-ubuntu-2204
+#            runs-on: buildjet-16vcpu-ubuntu-2204
 #
 #    runs-on: ${{ matrix.runs-on }}
 #
diff --git a/.github/workflows/hsm-demo-containers.yml b/.github/workflows/hsm-demo-containers.yml
deleted file mode 100644
index 95a3201a0..000000000
--- a/.github/workflows/hsm-demo-containers.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: Build Push Containers
-
-on:
-  pull_request:
-    types:
-      - labeled
-      - opened
-      - synchronize
-  push:
-    branches:
-      - '**' 
-
-jobs:
-
-  hsm-demo-build:
-    if: github.event.label.name == 'cicd:hsm-demo-containers' ||  github.ref == 'refs/heads/main'
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        architecture: [x86_64, arm64]
-        
-    runs-on: ${{ matrix.architecture == 'x86_64' && 'buildjet-8vcpu-ubuntu-2204' || 'buildjet-8vcpu-ubuntu-2204-arm' }}
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-        ref: ${{ github.event.pull_request.head.ref || github.ref }}
-    
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Login to Docker Hub to Avoid Rate Limiting
-      uses: docker/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-    - name: Build and Push Docker image movement
-      run: |
-        ./scripts/movement/build-push-image hsm-demo
-
-  hsm-demo-manifest:
-    permissions:
-      contents: read
-      packages: write
-    needs: hsm-demo-build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with: 
-          submodules: true
-          ref: ${{ github.event.pull_request.head.ref || github.ref }}
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Login to Docker Hub to Avoid Rate Limiting
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-      - name: Build and Push Docker image movement
-        run: |
-          ./scripts/movement/manifest hsm-demo
\ No newline at end of file