diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a8dc11949fe32640dd10753fb1b45261dee9cfad
--- /dev/null
+++ b/.github/workflows/dockerimage.yml
@@ -0,0 +1,29 @@
+name: Bor Docker Image CI
+
+on:
+  push:
+    branches-ignore:
+      - '**'
+    tags:
+      - 'v*.*.*'
+      # to be used by fork patch-releases ^^
+      - 'v*.*.*-*'
+  
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build the Bor Docker image
+      env:
+        DOCKERHUB: ${{ secrets.DOCKERHUB }}
+        DOCKERHUB_KEY: ${{ secrets.DOCKERHUB_KEY }}
+      run: |
+        ls -l
+        echo "Docker login"
+        docker login -u $DOCKERHUB -p $DOCKERHUB_KEY
+        echo "running build"
+        docker build -f Dockerfile.classic -t maticnetwork/bor:${GITHUB_REF/refs\/tags\//} .
+        echo "pushing image"
+        docker push maticnetwork/bor:${GITHUB_REF/refs\/tags\//}
+        echo "DONE!"
diff --git a/.goreleaser.yml b/.goreleaser.yml
index b25a3164498889cf1792c2ea12d07f69a30adf57..aed63c3588cb67d9a4ae9073383edd2dec2a3958 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -95,7 +95,6 @@ dockers:
       - linux-amd64
     build_flag_templates:
       - --platform=linux/amd64
-    skip_push: true
   
   - image_templates:
       - 0xpolygon/{{ .ProjectName }}:{{ .Version }}-arm64
@@ -106,7 +105,6 @@ dockers:
       - linux-arm64
     build_flag_templates:
       - --platform=linux/arm64
-    skip_push: true
 
 docker_manifests:
   - name_template: 0xpolygon/{{ .ProjectName }}:{{ .Version }}
diff --git a/Dockerfile.classic b/Dockerfile.classic
new file mode 100644
index 0000000000000000000000000000000000000000..a60c55e7d450c02785ea61099a09a530c0e97585
--- /dev/null
+++ b/Dockerfile.classic
@@ -0,0 +1,18 @@
+# Build Geth in a stock Go builder container
+FROM golang:1.17-alpine as builder
+
+RUN apk add --no-cache make gcc musl-dev linux-headers git bash
+
+ADD . /bor
+RUN cd /bor && make bor-all
+
+CMD ["/bin/bash"]
+
+# Pull Bor into a second stage deploy alpine container
+FROM alpine:latest
+
+RUN apk add --no-cache ca-certificates
+COPY --from=builder /bor/build/bin/bor /usr/local/bin/
+COPY --from=builder /bor/build/bin/bootnode /usr/local/bin/
+
+EXPOSE 8545 8546 8547 30303 30303/udp