diff --git a/.drone.yml b/.drone.yml
index e68250ed..6e86f80b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,20 +4,21 @@ name: api
 
 steps:
   - name: "Sync upstream and try PR"
-    image: docker.b12f.io/pub-solar/minimal-git:latest
-    settings:
-      registry: docker.b12f.io
-      repo: docker.b12f.io/pub-solar/minimal-git
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
+    image: nixery.dev/git/tea/shell
     environment:
       GITEA_SSH_KEY:
         from_secret: gitea_ssh_key
     commands:
       - echo $GITEA_SSH_KEY > ~/.ssh/id_rsa
+      - echo <<EOF
+        Host git.b12f.io
+          Port 2222
+          User git
+          HostName git.b12f.io
+        EOF >> ~/.ssh/config
       - git clone -b core git@git.b12f.io:pub-solar/os
+      - cd os
       - git remote add devos https://github.com/divnix/devos.git
       - git fetch --all
-      - git rebase devos/core
+      - git merge devos/core
+      - git push origin core