diff --git a/share/gitea-tekton-org/gitea_hook.tf b/share/gitea-tekton-org/gitea_hook.tf
index 7ddcd6a..f341532 100644
--- a/share/gitea-tekton-org/gitea_hook.tf
+++ b/share/gitea-tekton-org/gitea_hook.tf
@@ -47,7 +47,7 @@ resource "restapi_object" "gitea_org_hook" {
 resource "restapi_object" "ci-user-token" {
   path = "/users/org-${var.organization}-ci/tokens"
   data = jsonencode({
-    name = "${var.organization}-tekton-${var.instance}-${var.component}-${var.namespace}"
+    name = "${var.organization}-tekton-${var.component}-${var.namespace}-${var.instance}"
     scopes = [
       "write:repository"
     ]
@@ -61,7 +61,7 @@ resource "kubernetes_secret_v1" "ci-user-token-secret" {
   }
   data = {
     url = "gitea-http.${var.domain}-ci.svc:3000"
-    token = jsondecode(resource.restapi_object.gitea_ci-user-token.create_response).sha1
+    token = jsondecode(resource.restapi_object.ci-user-token.create_response).sha1
   }
 }