diff --git a/.github/workflows/docker-tag-triggered-prod.yml b/.github/workflows/wokrflow-docker-release.yml
similarity index 85%
rename from .github/workflows/docker-tag-triggered-prod.yml
rename to .github/workflows/wokrflow-docker-release.yml
index 40a320f..66b9078 100644
--- a/.github/workflows/docker-tag-triggered-prod.yml
+++ b/.github/workflows/wokrflow-docker-release.yml
@@ -1,4 +1,4 @@
-name: docker-tag-triggered-prod
+name: wokrflow-docker-release
 
 on:
   push:
@@ -71,6 +71,14 @@ jobs:
           retry_wait_seconds: 120
           command: |
             docker images
+      - name: Run Smoke Tests
+        shell: bash
+        run: |
+          git_clone_scripts_dest="/tmp/scripts"
+          git_clone_scripts_repo="https://github.com/binhex/scripts.git"
+
+          git clone "${git_clone_scripts_repo}" "${git_clone_scripts_dest}"
+          "${git_clone_scripts_dest}/shell/arch/docker/testrunner.sh" --image-name "ghcr.io/${{ github.repository }}:${{ steps.identify_tag.outputs.tag }}" --host-port '9999' --container-port '8118' --network-type 'bridge' --env-vars '-e VPN_ENABLED=no'
       - name: Push Docker image to Docker Hub
         uses: nick-invision/retry@v2.4.0
         with:
diff --git a/.github/workflows/docker-manual-triggered-test.yml b/.github/workflows/workflow-docker-manual.yml
similarity index 77%
rename from .github/workflows/docker-manual-triggered-test.yml
rename to .github/workflows/workflow-docker-manual.yml
index a8db3ef..e4b0a1e 100644
--- a/.github/workflows/docker-manual-triggered-test.yml
+++ b/.github/workflows/workflow-docker-manual.yml
@@ -1,4 +1,4 @@
-name: docker-manual-triggered-test
+name: workflow-docker-manual
 
 on:
   workflow_dispatch:
@@ -43,6 +43,14 @@ jobs:
               --tag ${{ github.repository }}:${{ github.event.inputs.tags }} \
               --tag ghcr.io/${{ github.repository }}:${{ github.event.inputs.tags }} \
               .
+      - name: Run Smoke Tests
+        shell: bash
+        run: |
+          git_clone_scripts_dest="/tmp/scripts"
+          git_clone_scripts_repo="https://github.com/binhex/scripts.git"
+
+          git clone "${git_clone_scripts_repo}" "${git_clone_scripts_dest}"
+          "${git_clone_scripts_dest}/shell/arch/docker/testrunner.sh" --image-name "ghcr.io/${{ github.repository }}:${{ github.event.inputs.tags }}" --host-port '9999' --container-port '8118' --network-type 'bridge' --env-vars '-e VPN_ENABLED=no'
       - name: Push Docker image to Docker Hub
         uses: nick-invision/retry@v2.4.0
         with: