diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2c7bd0a..5459db3 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -42,20 +42,25 @@ steps:
         echo "Build completed: $CI_COMMIT_SHA" |
         curl -X POST -H "Content-Type: application/json" --data '{"text": "Build completed: '$CI_COMMIT_SHA'"}' $WEBHOOK_URL  
  
-  - name: push-to-github
-    # Corrected Indentation applied to all keys below this line:
-    image: alpine/git
-    environment:
-      GITHUB_TOKEN:
-        from_secret: GITHUB_TOKEN
-    when:
-      status: [ success ]
-    commands:
-      # --- ADDED: Verify repository integrity ---
-      - echo "Verifying local git integrity..."
-      - git fsck --full
-      # If the above fails, the pipeline step will stop here.
+- name: push-to-github
+  image: alpine/git
+  environment:
+    GITHUB_TOKEN:
+      from_secret: GITHUB_TOKEN
+  when:
+    status: [ success ]
+  commands:
+    - echo "Verifying local git integrity..."
+    - git fsck --full
 
-      # --- Existing Commands ---
-      - git remote add github https://$GITHUB_TOKEN@github.com/Magiciian/dummy-app.git
-      - git push github HEAD:main
\ No newline at end of file
+    - git config --global user.name "woodpecker"
+    - git config --global user.email "ci@localhost"
+
+    - git remote add github https://$GITHUB_TOKEN@github.com/Magiciian/dummy-app.git
+
+    # IMPORTANT: Pull latest main before pushing
+    - git fetch github main
+    - git rebase github/main
+
+    # Push cleanly after rebase
+    - git push github HEAD:main