diff --git a/files/pushgit.sh b/files/pushgit.sh
index 6d13263..f5d385d 100644
--- a/files/pushgit.sh
+++ b/files/pushgit.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
+export GIT_AUTHOR_NAME="vestasync_wb_$(hostname)"
+export GIT_COMMITTER_NAME="vestasync_wb_$(hostname)"
 cd /mnt/data/etc/ > /dev/null 2>&1 || true
 git add . > /dev/null 2>&1 || true
 git commit -m "$(date)" > /dev/null 2>&1 || true
diff --git a/vestasync.py b/vestasync.py
index 9b14de8..8e36e96 100755
--- a/vestasync.py
+++ b/vestasync.py
@@ -70,8 +70,7 @@ def prepare_packages_wb(c):
 
 
 def configure_git(c):
-    hostname = c.run('hostname', hide=True).stdout.strip()
-    c.run(f'git config --global user.name vestasync_wb_{hostname}')
+    c.run(f'git config --global user.name vestasync_wb_$(hostname)_manual')
     c.run(f'git config --global user.email "vestasync@fake.mail"')
     c.run(f'git config --global init.defaultBranch "master"')