diff --git a/.github/workflows/on-master-push.yml b/.github/workflows/on-master-push.yml
new file mode 100644
index 0000000..3597631
--- /dev/null
+++ b/.github/workflows/on-master-push.yml
@@ -0,0 +1,36 @@
+name: Build on master push
+
+on:
+  push:
+    branches:
+      - master
+
+env:
+  DOCKER_CLI_EXPERIMENTAL: enabled
+
+jobs:
+  build:
+    name: Build and push Docker image
+    runs-on: ubuntu-18.04
+    env:
+      TOR_VERSION: 0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208
+    steps:
+      - name: Login to Docker Hub
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
+      - name: Checkout project
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Setup Docker buildx action
+        uses: docker/setup-buildx-action@v1
+
+      - name: Run Docker buildx
+        run: |
+          docker buildx build \
+          --platform linux/amd64,linux/arm64 \
+          --build-arg TOR_VERSION=$TOR_VERSION \
+          --tag ${{ secrets.DOCKER_HUB_USER }}/tor-server:$TOR_VERSION \
+          --push .
\ No newline at end of file
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
deleted file mode 100644
index 4ef5ff9..0000000
--- a/.github/workflows/on-push.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Docker build on push
-env:
-  DOCKER_CLI_EXPERIMENTAL: enabled
-
-on: push
-
-jobs:
-  build:
-    runs-on: ubuntu-18.04
-    name: Build
-    steps:
-      - name: Checkout project
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Setup Docker buildx action
-        uses: docker/setup-buildx-action@v1
-
-      - name: Run Docker buildx
-        run: |
-          docker buildx build \
-          --platform linux/amd64,linux/arm64 \
-          --tag tor-server .
diff --git a/Dockerfile b/Dockerfile
index 6e09a27..58dd387 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM lncm/tor:0.4.6.8
+ARG TOR_VERSION=0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208
+
+FROM lncm/tor:$TOR_VERSION
 
 # Install s6
 USER root