diff --git a/.drone.yml b/.drone.yml
index 974df2a424..a1c3082546 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -135,6 +135,8 @@ steps:
     - chmod 0600 ~/.ssh/id_rsa
     - ssh-keyscan git.platypush.tech >> ~/.ssh/known_hosts 2>/dev/null
 
+    # Backup the original git configuration before changing name and email
+    - cp .git/config /tmp/git.config.orig
     - git config user.name "Platypush CI/CD Automation"
     - git config user.email "admin@platypush.tech"
     - git config commit.gpgsign true
@@ -145,6 +147,9 @@ steps:
     - git remote add origin git@git.platypush.tech:platypush/platypush.git
     - git push origin master
 
+    # Restore the original git configuration
+    - mv /tmp/git.config.orig .git/config
+
 - name: update-arch-packages
   image: python:3.11-alpine
   environment: