diff --git a/tools/argocd/blueprint.cue b/tools/argocd/blueprint.cue
index 74e8bf7a..1988ee74 100644
--- a/tools/argocd/blueprint.cue
+++ b/tools/argocd/blueprint.cue
@@ -4,12 +4,11 @@ project: {
 	release: {
 		docker: {
 			on: {
-				//merge: {}
-				//tag: {}
-				always: {}
+				merge: {}
+				tag: {}
 			}
 			config: {
-				tag: _ @forge(name="GIT_COMMIT_HASH")
+				tag: _ @forge(name="GIT_HASH_OR_TAG")
 			}
 		}
 	}