diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index f47bba64d7e6dfb49530bc7030d5e1e8f7dab740..d1ea5862af1d7de482b9a46a7c0e3a27a588b044 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -14,11 +14,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Docker login
-      run: |
-        echo ${{ secrets.DOCKER_USER }} | docker login -u ${{ secrets.DOCKER_PASSWORD }} --password-stdin
-    - name: Build the Docker image
-      run: docker build . --file dev/docker/Dockerfile --tag bolkedebruin/rdpgw:$(date +%s)
-    - name: Publish
-      run: docker push bolkedebruin/rdpgw
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+         username: ${{ secrets.DOCKERHUB_USERNAME }}
+         password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build the Docker image
+        run: docker build . --file dev/docker/Dockerfile --tag bolkedebruin/rdpgw:$(date +%s)
+      - name: Publish
+        run: docker push bolkedebruin/rdpgw