diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker_build.yaml
similarity index 100%
rename from .github/workflows/docker.yaml
rename to .github/workflows/docker_build.yaml
diff --git a/.github/workflows/docker_publish.yaml b/.github/workflows/docker_publish.yaml
new file mode 100644
index 0000000000..3b9ad13a98
--- /dev/null
+++ b/.github/workflows/docker_publish.yaml
@@ -0,0 +1,38 @@
+# Publish docker images to dockerhub
+
+name: Docker Publish
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  server_image:
+    name: Push InvenTree web server image to dockerhub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v2
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: inventree/inventree
+          tag_with_ref: true
+          context: docker/inventree
+
+  nginx_image:
+    name: Push InvenTree nginx image to dockerhub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v2
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: inventree/nginx
+          tag_with_ref: true
+          context: docker/nginx