diff --git a/.drone.yml b/.drone.yml
index 8285c41..26fcc54 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,23 +20,19 @@ trigger:
 
 steps:
   - name: build-and-publish-container
-    image: docker:cli
+    image: docker:dind
     volumes:
       - name: dockersock
         path: /var/run
     environment:
       REGISTRY: git.local-it.org/ci-builder
       IMAGE_NAME: mitgliederverwaltung
-      REGISTRY_USERNAME:
-        from_secret: DRONE_REGISTRY_USERNAME
-      REGISTRY_TOKEN:
-        from_secret: DRONE_REGISTRY_TOKEN
     commands:
       - sleep 6 # give docker time to start
       # Build image once
       - docker build --tag $REGISTRY/$IMAGE_NAME:build-$DRONE_BUILD_NUMBER .
       # Login to registry
-      - echo "$REGISTRY_TOKEN" | docker login --username "$REGISTRY_USERNAME" --password-stdin git.local-it.org
+      - docker login --username $DRONE_FORGEJO_ACCOUNT_USERNAME --password $DRONE_FORGEJO_ACCOUNT_PASSWORD git.local-it.org
       # Tag and push based on event type
       - |
         if [ "$DRONE_BUILD_EVENT" = "tag" ]; then