diff --git a/.github/workflows/packer-aws.yml b/.github/workflows/packer-aws.yml
index 0f3cbd2..ece11a8 100644
--- a/.github/workflows/packer-aws.yml
+++ b/.github/workflows/packer-aws.yml
@@ -5,6 +5,11 @@ on:
     workflows: ["Build and Publish devcontainer image"]
     types:
       - completed
+  workflow_dispatch:
+    inputs:
+      glueops_codespace_tag:
+        description: 'Enter the github.com/glueops/codespaces tag to use (e.g. v0.60.0)'
+        required: false
 
 jobs:
   build:
@@ -25,7 +30,7 @@ jobs:
 
       - name: Run `packer build`
         id: build
-        run: packer build -var glueops_codespaces_container_tag=${{ github.event.workflow_run.head_branch }} aws.pkr.hcl
+        run: packer build -var glueops_codespaces_container_tag=${{ inputs.glueops_codespace_tag || github.event.workflow_run.head_branch }} aws.pkr.hcl
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY }}
diff --git a/.github/workflows/packer-hetzner.yml b/.github/workflows/packer-hetzner.yml
index 466b3ae..6dffb84 100644
--- a/.github/workflows/packer-hetzner.yml
+++ b/.github/workflows/packer-hetzner.yml
@@ -5,6 +5,11 @@ on:
     workflows: ["Build and Publish devcontainer image"]
     types:
       - completed
+  workflow_dispatch:
+    inputs:
+      glueops_codespace_tag:
+        description: 'Enter the github.com/glueops/codespaces tag to use (e.g. v0.60.0)'
+        required: false
 
 jobs:
   build:
@@ -25,12 +30,12 @@ jobs:
 
       - name: Run `packer build stage`
         id: build_stage
-        run: packer build -var glueops_codespaces_container_tag=${{ github.event.workflow_run.head_branch }} hetzner.pkr.hcl
+        run: packer build -var glueops_codespaces_container_tag=${{ inputs.glueops_codespace_tag || github.event.workflow_run.head_branch }} hetzner.pkr.hcl
         env:
           HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN_STAGE }}
 
       - name: Run `packer build prod`
         id: build_prod
-        run: packer build -var glueops_codespaces_container_tag=${{ github.event.workflow_run.head_branch }} hetzner.pkr.hcl
+        run: packer build -var glueops_codespaces_container_tag=${{ inputs.glueops_codespace_tag || github.event.workflow_run.head_branch }} hetzner.pkr.hcl
         env:
           HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN_PROD }}
\ No newline at end of file
diff --git a/.github/workflows/packer-qemu.yml b/.github/workflows/packer-qemu.yml
index c14ae3c..4f0a014 100644
--- a/.github/workflows/packer-qemu.yml
+++ b/.github/workflows/packer-qemu.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
     inputs:
       glueops_codespace_tag:
-        description: 'Enter the Codespace tag name e.g. v0.60.0'
+        description: 'Enter the github.com/glueops/codespaces tag to use (e.g. v0.60.0)'
         required: false
 
 jobs: