diff --git a/share/gitea-tekton-org/index.rhai b/share/gitea-tekton-org/index.rhai
index dee0616..4c96fc8 100644
--- a/share/gitea-tekton-org/index.rhai
+++ b/share/gitea-tekton-org/index.rhai
@@ -34,7 +34,7 @@ const sources=[
 
 fn pre_pack() {
     for file in global::sources {
-        shell(`curl -sL ${file.url} > ${global::SRC}/${file.name}`);
+        //shell(`curl -sL ${file.url} > ${global::SRC}/${file.name}`);
     }
 }
 fn post_pack() {
diff --git a/share/gitea-tekton-org/listener.tf b/share/gitea-tekton-org/listener.tf
index 859cd17..024ab63 100644
--- a/share/gitea-tekton-org/listener.tf
+++ b/share/gitea-tekton-org/listener.tf
@@ -35,7 +35,7 @@ resource "kubectl_manifest" "el" {
               - key: deploy-url
                 expression: "body.repository.ssh_url.replace([body.repository.name,'.git'].join(), 'deploy.git')"
               - key: generate-name
-                expression: "'add-'+body.repository.name.replace('_','-').replace('/','-').lowerAscii()"
+                expression: "'add-'+body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -76,7 +76,7 @@ resource "kubectl_manifest" "el" {
               - key: git-default-branch
                 expression: "body.repository.default_branch"
               - key: generate-name
-                expression: "'delete-'+body.repository.name.replace('_','-').replace('/','-').lowerAscii()"
+                expression: "'delete-'+body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -114,7 +114,7 @@ resource "kubectl_manifest" "el" {
               - key: tag-name
                 expression: "body.release.tag_name"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-publish-'+body.release.tag_name.replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()+'-publish-'+body.release.tag_name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -152,7 +152,7 @@ resource "kubectl_manifest" "el" {
               - key: tag-name
                 expression: "body.release.tag_name"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-update-'+body.release.tag_name.replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()+'-update-'+body.release.tag_name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -190,11 +190,94 @@ resource "kubectl_manifest" "el" {
               - key: tag-name
                 expression: "body.release.tag_name"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-delete-'+body.release.tag_name.replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()+'-delete-'+body.release.tag_name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
               type: release-delete
+      - name: package-new
+        interceptors:
+        - name: event-package
+          ref:
+            kind: ClusterInterceptor
+            name: "cel"
+          params:
+            - name: "filter"
+              value: "header.match('X-GitHub-Event', 'package')"
+        - name: action-created
+          ref:
+            kind: ClusterInterceptor
+            name: "cel"
+          params:
+            - name: "filter"
+              value: "body.action == 'created'"
+        - name: repository-set
+          ref:
+            kind: ClusterInterceptor
+            name: "cel"
+          params:
+            - name: "filter"
+              value: "has(body.package.repository)"
+            - name: "overlays"
+              value:
+              - key: artifactory-url
+                expression: "body.package.repository.clone_url.split('/')[2]"
+              - key: project-name
+                expression: "body.package.repository.name"
+              - key: project-path
+                expression: "body.package.repository.full_name"
+              - key: git-repository-url
+                expression: "body.package.repository.ssh_url"
+              - key: package-name
+                expression: "body.package.name"
+              - key: package-type
+                expression: "body.package.type"
+              - key: package-version
+                expression: "body.package.version"
+              - key: generate-name
+                expression: "body.package.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii() + '-add-' + body.package.version.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
+        triggerSelector:
+          labelSelector:
+            matchLabels:
+              type: package-new
+      - name: package-delete
+        interceptors:
+        - name: event-release
+          ref:
+            kind: ClusterInterceptor
+            name: "cel"
+          params:
+            - name: "filter"
+              value: "header.match('X-GitHub-Event', 'package')"
+        - name: action-deleted
+          ref:
+            kind: ClusterInterceptor
+            name: "cel"
+          params:
+            - name: "filter"
+              value: "body.action == 'deleted'"
+            - name: "overlays"
+              value:
+              - key: artifactory-url
+                expression: "body.package.repository.clone_url.split('/')[2]"
+              - key: project-name
+                expression: "body.package.repository.name"
+              - key: project-path
+                expression: "body.package.repository.full_name"
+              - key: git-repository-url
+                expression: "body.package.repository.ssh_url"
+              - key: package-name
+                expression: "body.package.name"
+              - key: package-type
+                expression: "body.package.type"
+              - key: package-version
+                expression: "body.package.version"
+              - key: generate-name
+                expression: "body.package.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii() + '-rm-' + body.package.version.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
+        triggerSelector:
+          labelSelector:
+            matchLabels:
+              type: package-delete
       - name: pr-open
         interceptors:
         - name: event-repository
@@ -264,7 +347,7 @@ resource "kubectl_manifest" "el" {
               - key: tag-name
                 expression: "body.ref"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-tag-new-'+body.ref.replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()+'-tag-new-'+body.ref.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -297,7 +380,7 @@ resource "kubectl_manifest" "el" {
               - key: tag-name
                 expression: "body.ref"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-tag-delete-'+body.ref.replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()+'-tag-delete-'+body.ref.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -333,7 +416,7 @@ resource "kubectl_manifest" "el" {
               - key: branch-name
                 expression: "body.ref"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-branch-new-'+body.ref.replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()+'-branch-new-'+body.ref.replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -371,7 +454,7 @@ resource "kubectl_manifest" "el" {
               - key: branch-name
                 expression: "body.ref.replace('refs/heads/','')"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-push-'+body.ref.replace('refs/heads/','').replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()+'-push-'+body.ref.replace('refs/heads/','').replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -414,7 +497,7 @@ resource "kubectl_manifest" "el" {
               - key: tag-name
                 expression: "body.ref.replace('refs/tags/','')"
               - key: generate-name
-                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-tag-'+body.ref.replace('refs/tags/','').replace('_','-').replace('/','-').lowerAscii()"
+                expression: "body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()+'-tag-'+body.ref.replace('refs/tags/','').replace('_','-').replace('/','-').replace(':','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels: