diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
new file mode 100644
index 0000000..4b4a7e4
--- /dev/null
+++ b/.github/workflows/release-docker.yml
@@ -0,0 +1,41 @@
+name: Publish Docker image
+
+on: 
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+      - 
+        id: version
+        name: Fetch latest NPM version
+        run: echo ::set-output name=version::$(npm show thumbsup version)
+      -
+        name: Publish Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: docker
+          file: ./docker/Dockerfile.release
+          build-args: PACKAGE_VERSION=${{ steps.version.outputs.version }}
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ghcr.io/thumbsup/thumbsup:${{ steps.version.outputs.version }}
+            ghcr.io/thumbsup/thumbsup:latest
+          push: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66a8e52..8038777 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,16 +10,20 @@ jobs:
     name: Create Release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
+      -
+        name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 100
-      - name: Get the version
+      - 
+        name: Get the version
         id: version
         run: echo ::set-output name=tag::${GITHUB_REF:10}
-      - name: Generate change log
+      -
+        name: Generate change log
         run: scripts/changelog ${{ steps.version.outputs.tag }} > CHANGELOG.md
-      - name: Create Release
+      -
+        name: Create Release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 999507f..a85fbad 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,4 +22,4 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfile.test
+          file: ./docker/Dockerfile.test
diff --git a/Dockerfile.release b/docker/Dockerfile.release
similarity index 100%
rename from Dockerfile.release
rename to docker/Dockerfile.release
diff --git a/Dockerfile.test b/docker/Dockerfile.test
similarity index 100%
rename from Dockerfile.test
rename to docker/Dockerfile.test