diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0fb0976..34584a5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,14 +5,19 @@ on:
     branches:
       - main
       - dev
-
 jobs:
-
   build-and-push:
-    runs-on: docker 
-    container: ubuntu:latest
+    runs-on: ubuntu-latest
+    container: gittea/runner-images:ubuntu-latest
 
     steps:
+      - name: Login to Forgejo
+        uses: docker/login-action@v3
+        with:
+          registry: git.jan-ole.cloud
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Checkout code
         uses: actions/checkout@v3
 
@@ -27,7 +32,6 @@ jobs:
           else
             DOCKER_TAG="other"
           fi
-          echo ${{ secrets.DOCKER_TOKEN }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
           docker build -t $DOCKER_IMAGE_NAME .
-          docker tag $DOCKER_IMAGE_NAME:latest ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
-          docker push ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
+          docker tag $DOCKER_IMAGE_NAME:latest git.jan-ole.cloud/${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
+          docker push git.jan-ole.cloud/${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
\ No newline at end of file