diff --git a/.github/workflows/bouncer.yml b/.github/workflows/bouncer.yml
index 5aaa570..4914461 100644
--- a/.github/workflows/bouncer.yml
+++ b/.github/workflows/bouncer.yml
@@ -18,9 +18,6 @@ concurrency:
   group: bouncer-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   bouncer-build:
     name: Build Bouncer
@@ -59,14 +56,12 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 4333723..6e6683a 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -13,9 +13,6 @@ on:
       - "laravel/**"
       - ".github/workflows/laravel.yml"
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   laravel-build:
     name: "Build: Laravel Container"
@@ -38,14 +35,12 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -58,7 +53,7 @@ jobs:
           context: laravel
           platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           build-args: |
             PHP_VERSION=${{ matrix.version }}
           tags: |
@@ -76,14 +71,12 @@ jobs:
     needs: [laravel-build]
     steps:
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
index 4f47e1e..f9ff6c9 100644
--- a/.github/workflows/mariadb.yml
+++ b/.github/workflows/mariadb.yml
@@ -14,9 +14,6 @@ on:
       - mariadb/**
       - .github/workflows/mariadb.yml
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   mariadb-build:
     name: "Build"
@@ -45,14 +42,12 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -65,7 +60,7 @@ jobs:
           context: mariadb
           platforms: ${{ env.ACT && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
           pull: true
-          push: ${{ env.should_push }}
+          push: true
           tags: |
             benzine/mariadb:${{ matrix.version }}
             ghcr.io/benzine-framework/mariadb:${{ matrix.version }}
diff --git a/.github/workflows/marshall.yml b/.github/workflows/marshall.yml
index 1d24ba2..2f848b6 100644
--- a/.github/workflows/marshall.yml
+++ b/.github/workflows/marshall.yml
@@ -70,14 +70,12 @@ jobs:
       - uses: docker/setup-buildx-action@v3
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -151,14 +149,12 @@ jobs:
       - uses: docker/setup-buildx-action@v3
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -219,14 +215,12 @@ jobs:
           - "ghcr.io/benzine-framework/marshall"
     steps:
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
diff --git a/.github/workflows/mitm-proxy.yml b/.github/workflows/mitm-proxy.yml
index 14d4285..f0e40bc 100644
--- a/.github/workflows/mitm-proxy.yml
+++ b/.github/workflows/mitm-proxy.yml
@@ -14,9 +14,6 @@ on:
       - mitm-proxy/**
       - .github/workflows/mitm-proxy.yml
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   mitmproxy-build:
     name: "MITM proxy with Healthchecks"
@@ -74,14 +71,12 @@ jobs:
             mitm-proxy
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -100,9 +95,9 @@ jobs:
             BUILD_DATE=${{ github.event.repository.pushed_at }}
           platforms: ${{ (!env.ACT && !(startsWith('6.',matrix.mitmproxy) || startsWith('5.', matrix.mitmproxy))) && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           pull: true
-          push: ${{ env.should_push }}
+          push: true
           tags: |
             ${{ format('benzine/mitmproxy:{0}', matrix.mitmproxy) }}
-            ${{ env.should_push && format('ghcr.io/benzine-framework/mitmproxy:{0}', matrix.mitmproxy) }}
+            ${{ format('ghcr.io/benzine-framework/mitmproxy:{0}', matrix.mitmproxy) }}
           cache-from: ${{ !env.ACT && 'type=gha' || '' }}
           cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}
diff --git a/.github/workflows/mqtt.yml b/.github/workflows/mqtt.yml
index 250caaa..67ef5f5 100644
--- a/.github/workflows/mqtt.yml
+++ b/.github/workflows/mqtt.yml
@@ -8,9 +8,6 @@ on:
   workflow_call:
   workflow_dispatch:
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   mqtt-build:
     name: "Build"
@@ -38,14 +35,12 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -58,7 +53,7 @@ jobs:
           context: mqtt
           platforms: linux/amd64,linux/arm64
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: |
             gone/mqtt:${{ matrix.version }}${{ matrix.openssl }}
             benzine/mqtt:${{ matrix.version }}${{ matrix.openssl }}
diff --git a/.github/workflows/mysql-proxy.yml b/.github/workflows/mysql-proxy.yml
index 4d7eb1c..60e2747 100644
--- a/.github/workflows/mysql-proxy.yml
+++ b/.github/workflows/mysql-proxy.yml
@@ -12,9 +12,6 @@ concurrency:
   group: mysql-proxy-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   mysql-proxy-build:
     name: "Build"
@@ -30,14 +27,12 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -57,7 +52,7 @@ jobs:
           target: mysql-proxy
           platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: |
             ${{ !env.ACT && 'benzine/mysql-proxy:latest' || '' }}
             ${{ !env.ACT && 'ghcr.io/benzine-framework/mysql-proxy:latest' || 'ghcr.io/benzine-framework/mysql-proxy:devel' }}
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index 63766dd..b272b12 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -12,9 +12,6 @@ concurrency:
   group: nodejs-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   node-flavours-build:
     name: "Build"
@@ -44,14 +41,12 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -66,7 +61,7 @@ jobs:
           target: nodejs
           platforms: linux/amd64,linux/arm64
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: |
             gone/node:${{ matrix.node }}-${{ matrix.yarn }}
             benzine/node:${{ matrix.node }}-${{ matrix.yarn }}
diff --git a/.github/workflows/octoprint.yml b/.github/workflows/octoprint.yml
index 1172da0..82d2685 100644
--- a/.github/workflows/octoprint.yml
+++ b/.github/workflows/octoprint.yml
@@ -14,9 +14,6 @@ on:
       - "octoprint/**"
       - ".github/workflows/octoprint.yml"
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   octoprint-build:
     name: "Bake Octoprint"
@@ -37,7 +34,7 @@ jobs:
           target: octoprint
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: matthewbaggett/octoprint:latest
 
   octoprint-mjpg-build:
@@ -48,14 +45,12 @@ jobs:
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v2
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -68,5 +63,5 @@ jobs:
           target: octoprint-mjpg-streamer
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: matthewbaggett/octoprint:mjpg-streamer-yu12
diff --git a/.github/workflows/perl.yml b/.github/workflows/perl.yml
index 46963f7..39a8441 100644
--- a/.github/workflows/perl.yml
+++ b/.github/workflows/perl.yml
@@ -14,9 +14,6 @@ permissions:
   contents: read
   packages: write
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   perl-build:
     name: "Build Perl"
@@ -39,14 +36,12 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index a3a06a4..15af795 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -8,9 +8,6 @@ permissions:
   contents: read
   packages: write
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   php-flavours-build:
     name: "Build PHP Flavours"
@@ -74,14 +71,12 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -99,7 +94,7 @@ jobs:
           target: php-${{ matrix.variant }}
           platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: |
             ghcr.io/benzine-framework/php:${{ matrix.variant }}-${{ matrix.version }}
             gone/php:${{ matrix.variant }}-${{ matrix.version }}
@@ -141,14 +136,12 @@ jobs:
           - "ghcr.io/benzine-framework/php"
     steps:
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 53405af..dbfb590 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -14,9 +14,6 @@ on:
       - postgres/**
       - .github/workflows/postgres.yml
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   postgres-build:
     name: "Build"
@@ -71,14 +68,12 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -105,7 +100,7 @@ jobs:
           context: postgres
           platforms: ${{ env.ACT && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
           pull: true
-          push: ${{ env.should_push }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           annotations: ${{ steps.meta.outputs.annotations }}
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
index a64ae11..32ef647 100644
--- a/.github/workflows/redis.yml
+++ b/.github/workflows/redis.yml
@@ -8,9 +8,6 @@ on:
   workflow_call:
   workflow_dispatch:
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   redis-build:
     name: "Build"
@@ -51,14 +48,12 @@ jobs:
             redis
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -75,9 +70,9 @@ jobs:
             HEALTH_INTERVAL=10s
           platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: |
             ${{ format('ghcr.io/benzine-framework/redis:{0}', matrix.redis) }}
-            ${{ env.should_push && format('benzine/redis:{0}',matrix.redis) || '' }}
+            ${{ format('benzine/redis:{0}',matrix.redis) || '' }}
           cache-from: ${{ !env.ACT && 'type=gha' || '' }}
           cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}
diff --git a/.github/workflows/s3db.yml b/.github/workflows/s3db.yml
index d132ad2..b610893 100644
--- a/.github/workflows/s3db.yml
+++ b/.github/workflows/s3db.yml
@@ -18,9 +18,6 @@ concurrency:
   group: ${{ github.workflow }}-s3db-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   s3db-build:
     name: Build S3DB
@@ -59,14 +56,12 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -98,7 +93,7 @@ jobs:
           target: ${{ matrix.database }}
           file: s3db/Dockerfile.${{ matrix.database }}
           platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
-          push: ${{ env.should_push }}
+          push: true
           tags: |
             ghcr.io/benzine-framework/s3db:${{ matrix.database }}-${{ matrix.version }}
             benzine/s3db:${{ matrix.database }}-${{ matrix.version }}
diff --git a/.github/workflows/swarm-monitor.yml b/.github/workflows/swarm-monitor.yml
index 9c3637d..f15cdb6 100644
--- a/.github/workflows/swarm-monitor.yml
+++ b/.github/workflows/swarm-monitor.yml
@@ -8,9 +8,6 @@ on:
   workflow_call:
   workflow_dispatch:
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   swarm-monitor-build:
     name: Build Swarm Monitor
@@ -39,14 +36,12 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -78,7 +73,7 @@ jobs:
           target: swarm-${{ matrix.component }}
           platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: |
             matthewbaggett/swarm-agent:${{ matrix.component }}
           cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=/tmp' }}
diff --git a/.github/workflows/wordpress.yml b/.github/workflows/wordpress.yml
index db2cd90..d54fa61 100644
--- a/.github/workflows/wordpress.yml
+++ b/.github/workflows/wordpress.yml
@@ -14,9 +14,6 @@ on:
       - "wordpress/**"
       - ".github/workflows/wordpress.yml"
 
-env:
-  should_push: ${{ github.ref == 'refs/heads/main' }}
-
 jobs:
   wordpress-build:
     name: "Bake Wordpress Container"
@@ -29,14 +26,12 @@ jobs:
       - uses: docker/setup-buildx-action@v2
 
       - name: "Setup: Login to Docker Hub"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: "Setup: Login to GHCR"
-        if: ${{ env.should_push }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -49,7 +44,7 @@ jobs:
           context: wordpress
           platforms: linux/amd64,linux/arm64
           pull: true
-          push: ${{ env.should_push && !env.ACT }}
+          push: true
           tags: |
             matthewbaggett/wordpress
           build-contexts: |