diff --git a/.drone.yml b/.drone.yml
index 263b44e..b627b6d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,7 +15,7 @@ steps:
       from_secret: GIT_PASS
 
 - name: generate
-  image: registry.itzana.me/strafesnet/tools/protobuild:latest
+  image: registry.itzana.me/strafesnet/tools/grpc-go:latest
   commands:
     - scripts/go-gen.sh
 
@@ -27,10 +27,8 @@ steps:
     - 'git commit -m "Autogenerated update for ${DRONE_COMMIT_LINK}" || true'
     - git push https://$GIT_USER:$GIT_PASS@git.itzana.me/StrafesNET/go-grpc.git --all
   environment:
-    GIT_USER:
-      from_secret: GIT_USER
-    GIT_PASS:
-      from_secret: GIT_PASS
+    GIT_USER: ${DRONE_GIT_USERNAME}
+    GIT_PASS: ${DRONE_GIT_PASSWORD}
 
 trigger:
   ref:
@@ -55,7 +53,7 @@ steps:
       from_secret: GIT_PASS
 
 - name: generate
-  image: registry.itzana.me/strafesnet/tools/protobuild:latest
+  image: registry.itzana.me/strafesnet/tools/python-grpc:latest
   commands:
     - scripts/python-gen.sh
 
@@ -65,12 +63,11 @@ steps:
     - cd python-grpc
     - git add *
     - 'git commit -m "Autogenerated update for ${DRONE_COMMIT_LINK}" || true'
+    - echo "-- $GIT_USER --"
     - git push https://$GIT_USER:$GIT_PASS@git.itzana.me/StrafesNET/python-grpc.git --all
   environment:
-    GIT_USER:
-      from_secret: GIT_USER
-    GIT_PASS:
-      from_secret: GIT_PASS
+    GIT_USER: ${DRONE_GIT_USERNAME}
+    GIT_PASS: ${DRONE_GIT_PASSWORD}
 
 trigger:
   ref: