diff --git a/.github/actions/build-push-image/action.yml b/.github/actions/build-push-image/action.yml
index 436ccec..c82361c 100644
--- a/.github/actions/build-push-image/action.yml
+++ b/.github/actions/build-push-image/action.yml
@@ -55,8 +55,9 @@ runs:
       if: ${{ inputs.push }}
       uses: redhat-actions/push-to-registry@v2
       with:
-        image: ${{ steps.build-image.outputs.image }}
+        image: ${{ inputs.image-name }}
         tags: ${{ steps.build-image.outputs.tags }}
+        registry: ${{ inputs.registry }}
         username: ${{ inputs.registry-user }}
         password: ${{ inputs.registry-password }}
 
diff --git a/.github/workflows/ci-unified.yml b/.github/workflows/ci-unified.yml
index 71c3bfe..11eaefd 100644
--- a/.github/workflows/ci-unified.yml
+++ b/.github/workflows/ci-unified.yml
@@ -23,7 +23,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/kubetools-kubectl.yml b/.github/workflows/kubetools-kubectl.yml
index 372c26c..eec7556 100644
--- a/.github/workflows/kubetools-kubectl.yml
+++ b/.github/workflows/kubetools-kubectl.yml
@@ -17,7 +17,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/mitogen.yml b/.github/workflows/mitogen.yml
index 41a62c6..383ec20 100644
--- a/.github/workflows/mitogen.yml
+++ b/.github/workflows/mitogen.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/packer.yml b/.github/workflows/packer.yml
index 577ddc4..907c160 100644
--- a/.github/workflows/packer.yml
+++ b/.github/workflows/packer.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/polkadotjs-cli.yml b/.github/workflows/polkadotjs-cli.yml
index 45589ef..95a6b2d 100644
--- a/.github/workflows/polkadotjs-cli.yml
+++ b/.github/workflows/polkadotjs-cli.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index e872fcc..5fec370 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/sops.yml b/.github/workflows/sops.yml
index 8da9a06..8c43731 100644
--- a/.github/workflows/sops.yml
+++ b/.github/workflows/sops.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps:
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 280d32a..8acfb60 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
index 590b617..0fc94b7 100644
--- a/.github/workflows/tools.yml
+++ b/.github/workflows/tools.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/ws-health-exporter.yml b/.github/workflows/ws-health-exporter.yml
index 6d7da72..12afffe 100644
--- a/.github/workflows/ws-health-exporter.yml
+++ b/.github/workflows/ws-health-exporter.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    environment: ${{ github.event_name == 'pull_request' && 'staging' || 'main' }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && 'main' || null }}
     steps: 
 
     - uses: actions/checkout@v4