diff --git a/.github/workflows/build-test-push.yml b/.github/workflows/build-test-push.yml
index 7544334..3fbf343 100644
--- a/.github/workflows/build-test-push.yml
+++ b/.github/workflows/build-test-push.yml
@@ -1,9 +1,15 @@
 name: Build-Test-Push
+
 on:
   workflow_dispatch:
+    inputs:
+      tag:
+        description: Optional tag to create in addition to the `latest` and `<timestamp>-<sha>` image tags.
+        required: false
   push:
     branches:
       - main
+
 jobs:
   Build-Test-Push:
     runs-on: ubuntu-latest
@@ -29,6 +35,11 @@ jobs:
         run: |
           docker tag puppet-dev-tools:latest-rootless ${{ secrets.DOCKERHUB_PUSH_USERNAME }}/puppet-dev-tools:$(date +"%F")-$(git rev-parse --short HEAD)-rootless
           docker tag puppet-dev-tools:latest ${{ secrets.DOCKERHUB_PUSH_USERNAME }}/puppet-dev-tools:$(date +"%F")-$(git rev-parse --short HEAD)
+      - name: Additional Tag
+        if: inputs.tag
+        run: |
+          docker tag puppet-dev-tools:latest-rootless ${{ secrets.DOCKERHUB_PUSH_USERNAME }}/puppet-dev-tools:${{ inputs.tag }}-rootless
+          docker tag puppet-dev-tools:latest ${{ secrets.DOCKERHUB_PUSH_USERNAME }}/puppet-dev-tools:${{ inputs.tag }}
       - name: List Docker images
         run: docker images --filter "reference=puppet-dev-tools*" --filter "reference=*/puppet-dev-tools*"
       - name: Show Docker image labels
@@ -40,3 +51,8 @@ jobs:
         run: |
           docker push ${{ secrets.DOCKERHUB_PUSH_USERNAME }}/puppet-dev-tools:$(date +"%F")-$(git rev-parse --short HEAD)-rootless
           docker push ${{ secrets.DOCKERHUB_PUSH_USERNAME }}/puppet-dev-tools:$(date +"%F")-$(git rev-parse --short HEAD)
+      - name: Push Additional Tag
+        if: inputs.tag
+        run: |
+          docker push ${{ secrets.DOCKERHUB_PUSH_USERNAME }}/puppet-dev-tools:${{ inputs.tag }}-rootless
+          docker push ${{ secrets.DOCKERHUB_PUSH_USERNAME }}/puppet-dev-tools:${{ inputs.tag }}