diff --git a/endpoints/trigger.py b/endpoints/trigger.py
index 2a4fda5e3..ffab858df 100644
--- a/endpoints/trigger.py
+++ b/endpoints/trigger.py
@@ -635,13 +635,8 @@ class CustomBuildTrigger(BuildTrigger):
 
     config = get_trigger_config(trigger)
     dockerfile_id = None
-    branch = run_parameters.get('branch_name', None)
-
-    tags = {branch}
-    if branch == 'master':
-      tags.add('latest')
-
-    build_name = 'HEAD'
+    tags = {run_parameters['commit_sha']}
+    build_name = run_parameters['commit_sha']
     metadata = {
       'commit_sha': run_parameters['commit_sha'],
       'git_url': config['build_source'],