diff --git a/.woodpecker/go-generate.yaml b/.woodpecker/go-generate.yaml
index d4562bd..d38c40c 100644
--- a/.woodpecker/go-generate.yaml
+++ b/.woodpecker/go-generate.yaml
@@ -15,6 +15,7 @@ steps:
       - git clone https://$GITEA_USER:$GITEA_TOKEN@gitea.badhouseplants.net/softplayer/softplayer-go-proto.git target
       - git -C ./target config user.name "devops-bot"
       - git -C ./target config user.email "bot@badhouseplants.net"
+      - git -C ./target checkout $CI_COMMIT_BRANCH || git -C ./target checkout -b $CI_COMMIT_BRANCH
   - name: Generate go code
     image: bufbuild/buf
     commands:
@@ -29,9 +30,6 @@ steps:
         from_secret: gitea_repo_access
     commands:
       - apk update && apk add git
-      - git config user.name "woodpecker-ci"
-      - git config user.email "bot@badhouseplants.net"
-      - git -C ./target checkout $CI_COMMIT_BRANCH || git -C ./target checkout -b $CI_COMMIT_BRANCH
       - git -C ./target add .
       - |-
         git -C ./target commit --allow-empty \
diff --git a/.woodpecker/js-generate.yaml b/.woodpecker/js-generate.yaml
index d37d234..47c184e 100644
--- a/.woodpecker/js-generate.yaml
+++ b/.woodpecker/js-generate.yaml
@@ -15,6 +15,7 @@ steps:
       - git clone https://$GITEA_USER:$GITEA_TOKEN@gitea.badhouseplants.net/softplayer/softplayer-js-proto.git target
       - git -C ./target config user.name "devops-bot"
       - git -C ./target config user.email "bot@badhouseplants.net"
+      - git -C ./target checkout $CI_COMMIT_BRANCH || git -C ./target checkout -b $CI_COMMIT_BRANCH
   - name: Generate go code
     image: bufbuild/buf
     commands:
@@ -36,7 +37,6 @@ steps:
         from_secret: gitea_repo_access
     commands:
       - apk update && apk add git
-      - git -C ./target checkout $CI_COMMIT_BRANCH || git -C ./target checkout -b $CI_COMMIT_BRANCH
       - git -C ./target add .
       - |-
         git -C ./target commit --allow-empty \