diff --git a/buildman/manager/executor.py b/buildman/manager/executor.py
index f3b23b07f..9457f4591 100644
--- a/buildman/manager/executor.py
+++ b/buildman/manager/executor.py
@@ -325,6 +325,10 @@ class KubernetesExecutor(BuilderExecutor):
       'cpu' : self.executor_config.get('CONTAINER_CPU_REQUEST', "2"),
     }
 
+    release_sha = release.GIT_HEAD or 'none'
+    if ' ' in release_sha:
+      release_sha = 'HEAD'
+
     return {
       'apiVersion': 'batch/v1',
       'kind': 'Job',
@@ -335,7 +339,7 @@ class KubernetesExecutor(BuilderExecutor):
           'build': build_uuid,
           'time': datetime.datetime.now().strftime('%Y-%m-%d-%H'),
           'manager': socket.gethostname(),
-          'quay-sha': release.GIT_HEAD or 'none',
+          'quay-sha': release_sha,
         },
       },
       'spec' : {
@@ -346,7 +350,7 @@ class KubernetesExecutor(BuilderExecutor):
               'build': build_uuid,
               'time': datetime.datetime.now().strftime('%Y-%m-%d-%H'),
               'manager': socket.gethostname(),
-              'quay-sha': release.GIT_HEAD or 'none',
+              'quay-sha': release_sha,
             },
           },
           'spec': {