diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml
index 914524e..2f3eac4 100644
--- a/.github/workflows/build_image.yml
+++ b/.github/workflows/build_image.yml
@@ -15,11 +15,12 @@ jobs:
       run: docker build . --file Dockerfile --target client --tag docker.pkg.github.com/janspeller/bw3-core/client:latest
     - name: Build the Docker image for the Server
       run: docker build . --file Dockerfile --target server --tag docker.pkg.github.com/janspeller/bw3-core/server:latest
-    - name: docker login
-      env:
-        GH_USERNAME: ${{ secrets.GH_USERNAME }}
-        GH_PAT: ${{ secrets.GH_PAT }}
-      run: echo $CR_PAT | docker login ghcr.io -u USERNAME --password-stdin
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GH_PAT }}
     - name: Push the Client Docker image to Github package repository
       run: docker push docker.pkg.github.com/BOSWatch/bw3-core/client:latest
     - name: Push the Server Docker image to Github package repository