diff --git a/homu/git_helper.py b/homu/git_helper.py
index 4bc2f92c..489e75de 100755
--- a/homu/git_helper.py
+++ b/homu/git_helper.py
@@ -1,13 +1,10 @@
 #!/usr/bin/env python3
 
 import sys
-import subprocess
 import os
 
-SSH_KEY_FILE = os.path.join(os.path.dirname(__file__), '../cache/key')
-
 def main():
-    args = ['ssh', '-i', SSH_KEY_FILE, '-S', 'none'] + sys.argv[1:]
+    args = ['ssh', '-i', os.getenv('HOMU_GIT_KEY_PATH'), '-S', 'none'] + sys.argv[1:]
     os.execvp('ssh', args)
 
 if __name__ == '__main__':
diff --git a/homu/main.py b/homu/main.py
index a0f0f703..c113a591 100644
--- a/homu/main.py
+++ b/homu/main.py
@@ -15,8 +15,8 @@
 from queue import Queue
 import os
 import subprocess
-from .git_helper import SSH_KEY_FILE
 import shlex
+import tempfile
 import sys
 
 STATUS_TO_PRIORITY = {
@@ -454,11 +454,6 @@ def create_merge(state, repo_cfg, branch, git_cfg):
         fpath = 'cache/{}/{}'.format(repo_cfg['owner'], repo_cfg['name'])
         url = 'git@github.com:{}/{}.git'.format(repo_cfg['owner'], repo_cfg['name'])
 
-        os.makedirs(os.path.dirname(SSH_KEY_FILE), exist_ok=True)
-        with open(SSH_KEY_FILE, 'w') as fp:
-            fp.write(git_cfg['ssh_key'])
-        os.chmod(SSH_KEY_FILE, 0o600)
-
         if not os.path.exists(fpath):
             utils.logged_call(['git', 'init', fpath])
             utils.logged_call(['git', '-C', fpath, 'remote', 'add', 'origin', url])
@@ -744,7 +739,8 @@ def fetch_mergeability(mergeable_que):
         finally:
             mergeable_que.task_done()
 
-def check_timeout(states, queue_handler):
+def check_timeout(states, queue_handler, tmp_ssh_key):
+    # This function holds a reference to tmp_ssh_key to keep it alive
     while True:
         try:
             for repo_label, repo_states in states.items():
@@ -1007,11 +1003,18 @@ def queue_handler():
     os.environ['GIT_SSH'] = os.path.join(os.path.dirname(__file__), 'git_helper.py')
     os.environ['GIT_EDITOR'] = 'cat'
 
+    tmp_ssh_key = None
+    if git_cfg['local_git']:
+        tmp_ssh_key = tempfile.NamedTemporaryFile(prefix='homu-sshkey')
+        tmp_ssh_key.write(git_cfg['ssh_key'].encode('utf-8'))
+        tmp_ssh_key.flush()
+        os.environ['HOMU_GIT_KEY_PATH'] = tmp_ssh_key.name
+
     from . import server
     Thread(target=server.start, args=[cfg, states, queue_handler, repo_cfgs, repos, logger, buildbot_slots, my_username, db, repo_labels, mergeable_que, gh]).start()
 
     Thread(target=fetch_mergeability, args=[mergeable_que]).start()
-    Thread(target=check_timeout, args=[states, queue_handler]).start()
+    Thread(target=check_timeout, args=[states, queue_handler, tmp_ssh_key]).start()
 
     queue_handler()
 
diff --git a/homu/utils.py b/homu/utils.py
index 4ce574b1..466e4ae2 100644
--- a/homu/utils.py
+++ b/homu/utils.py
@@ -54,7 +54,7 @@ def lazy_debug(logger, f):
         logger.debug(f())
 
 def logged_call(args):
-    try: subprocess.check_call(args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    try: subprocess.check_call(args)
     except subprocess.CalledProcessError as e:
         print('* Failed to execute command: {}'.format(args))
         raise