diff --git a/share/gitea-tekton-org/listener.tf b/share/gitea-tekton-org/listener.tf
index 369f5d5..859cd17 100644
--- a/share/gitea-tekton-org/listener.tf
+++ b/share/gitea-tekton-org/listener.tf
@@ -369,9 +369,9 @@ resource "kubectl_manifest" "el" {
               - key: git-revision
                 expression: "body.head_commit.id"
               - key: branch-name
-                expression: "body.ref.split('/')[2]"
+                expression: "body.ref.replace('refs/heads/','')"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-push-'+body.ref.split('/')[2].replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-push-'+body.ref.replace('refs/heads/','').replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -412,9 +412,9 @@ resource "kubectl_manifest" "el" {
               - key: git-revision
                 expression: "body.head_commit.id"
               - key: tag-name
-                expression: "body.ref.split('/')[2]"
+                expression: "body.ref.replace('refs/tags/','')"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-tag-'+body.ref.split('/')[2].replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-tag-'+body.ref.replace('refs/tags/','').replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels: