diff --git a/endpoints/trigger.py b/endpoints/trigger.py
index 1a07a357a..4c476533c 100644
--- a/endpoints/trigger.py
+++ b/endpoints/trigger.py
@@ -1048,7 +1048,7 @@ class CustomBuildTrigger(BuildTriggerHandler):
     }
 
     prepared = PreparedBuild(self.trigger)
-    prepared.tags = [commit_sha]
+    prepared.tags = [commit_sha[:7]]
     prepared.name_from_sha(commit_sha)
     prepared.subdirectory = config['subdir']
     prepared.metadata = metadata
diff --git a/static/js/services/trigger-service.js b/static/js/services/trigger-service.js
index e7c5f6cba..fd35b26e6 100644
--- a/static/js/services/trigger-service.js
+++ b/static/js/services/trigger-service.js
@@ -122,7 +122,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
           'title': 'Commit',
           'type': 'regex',
           'name': 'commit_sha',
-          'regex': '^([A-Fa-f0-9]{7})$',
+          'regex': '^([A-Fa-f0-9]{7,})$',
           'placeholder': '1c002dd'
         }
       ],