diff --git a/.github/workflows/create-release-workflow.yml b/.github/workflows/create-release-workflow.yml
index 1a3e36b..be8f0b5 100644
--- a/.github/workflows/create-release-workflow.yml
+++ b/.github/workflows/create-release-workflow.yml
@@ -35,3 +35,27 @@ jobs:
           asset_path: ./build/factorio-server-manager-linux.zip
           asset_name: factorio-server-manager-linux-${{ steps.tag_name.outputs.tag }}.zip
           asset_content_type: application/octet-stream
+  docker-push:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+      - uses: actions/setup-go@v2
+      - uses: docker/setup-buildx-action@v1
+      - name: Get git tag
+        id: tag_name
+        uses: little-core-labs/get-git-tag@v3.0.2
+      - name: Login to dockerhub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - run: make build; cp build/factorio-server-manager-linux.zip docker/factorio-server-manager-linux.zip
+      - uses: docker/build-push-action@v2
+        with:
+          context: ./docker/
+          file: ./docker/Dockerfile-local
+          push: true
+          tags: ofsm/ofsm:develop,ofsm/ofsm:${{ steps.tag_name.outputs.tag }}
+#          tags: ofsm/ofsm:latest,ofsm/ofsm:${{ steps.tag_name.outputs.tag }}
+