diff --git a/.github/workflows/test-dockerimage.yml b/.github/workflows/test-dockerimage.yml
new file mode 100644
index 0000000000000000000000000000000000000000..dac0f98af8242713ae0cc7e6615f17714cebee8e
--- /dev/null
+++ b/.github/workflows/test-dockerimage.yml
@@ -0,0 +1,24 @@
+name: Bor Docker Image CI
+
+on:
+  push:
+    branches: arpit/bor-docker
+  
+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 -t maticnetwork/bor:docker-1 .
+        echo "pushing image"
+        docker push maticnetwork/bor:docker-1
+        echo "DONE!"
diff --git a/Dockerfile b/Dockerfile
index 9e2fc22d8729a3c3a831216a34c3c2f62f9e21cc..1716354d492924d731569608caeba717f77c48e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,13 @@ FROM golang:1.16-alpine as builder
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 ADD . /bor
-RUN cd /bor && make bor
+RUN cd /bor && make bor-all
 
 # 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