diff --git a/.github/workflows/check_chart_repo.sh b/.github/workflows/check_chart_repo.sh
index 8151dfc..5b9258d 100755
--- a/.github/workflows/check_chart_repo.sh
+++ b/.github/workflows/check_chart_repo.sh
@@ -2,7 +2,7 @@
 # set -e
 set -ex
 
-VALIDATE_TARGET_REPO='https://harbor-cicd.taco-cat.xyz/chartrepo/tks'
+VALIDATE_TARGET_REPO='https://harbor.taco-cat.xyz/chartrepo/tks'
 #'https://openinfradev.github.io'
 EXCEPTION_LIST=
 #'https://argoproj.github.io/argo-helm,https://bitnami-labs.github.io/sealed-secrets,https://charts.appscode.com/stable,https://charts.appscode.com/stable/,https://charts.bitnami.com/bitnami,https://codecentric.github.io/helm-charts,https://grafana.github.io/helm-charts,https://helm-charts.wikimedia.org/stable/,https://helm.elastic.co,https://kiali.org/helm-charts,https://kubernetes-sigs.github.io/metrics-server/,https://kubernetes.github.io/ingress-nginx,https://prometheus-community.github.io/helm-charts'
diff --git a/.github/workflows/check_image_repo.sh b/.github/workflows/check_image_repo.sh
index 33b226d..50b14f1 100755
--- a/.github/workflows/check_image_repo.sh
+++ b/.github/workflows/check_image_repo.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-VALIDATE_TARGET_REPO='https://harbor-cicd.taco-cat.xyz/tks'
+VALIDATE_TARGET_REPO='https://harbor.taco-cat.xyz/tks'
 EXCEPTION_LIST=
 #'appscode/kubed:v0.12.0,appscode/kubed:v0.12.0-rc.3,busybox:1.31,busybox:1.31.1,calico/cni:v3.15.5,calico/kube-controllers:v3.15.5,calico/node:v3.15.5,calico/pod2daemon-flexvol:v3.15.5,directxman12/k8s-prometheus-adapter-amd64:v0.7.0,docker.elastic.co/eck/eck-operator:1.8.0,docker.elastic.co/elasticsearch/elasticsearch:7.5.1,docker.elastic.co/kibana/kibana:7.5.1,docker.io/bitnami/kube-state-metrics:1.9.7-debian-10-r143,docker.io/bitnami/minio:2021.6.14-debian-10-r0,docker.io/bitnami/postgresql:11.7.0-debian-10-r98,docker.io/bitnami/postgresql:15.1.0-debian-11-r0,docker.io/bitnami/thanos:0.17.2-scratch-r1,docker.io/grafana/loki:2.6.1,docker.io/grafana/promtail:2.4.1,docker.io/jboss/keycloak:10.0.0,docker.io/ncabatoff/process-exporter:0.2.11,docker.io/nginxinc/nginx-unprivileged:1.19-alpine,docker:19.03,ghcr.io/openinfradev/fluentbit:25bc31cd4333f7f77435561ec70bc68e0c73a194,ghcr.io/resmoio/kubernetes-event-exporter:v1.0,grafana/grafana:8.3.3,istio/pilot:1.13.1,istio/proxyv2:1.13.1,jaegertracing/jaeger-operator:1.29.1,k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2,k8s.gcr.io/hyperkube:v1.18.8,k8s.gcr.io/ingress-nginx/controller:v1.1.1@sha256:0bc88eb15f9e7f84e8e56c14fa5735aaa488b840983f87bd79b1054190e660de,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660,k8s.gcr.io/metrics-server/metrics-server:v0.6.1,kubesphere/fluent-operator:v1.5.0,prom/pushgateway:v1.3.0,quay.io/airshipit/kubernetes-entrypoint:v1.0.0,quay.io/argoproj/argocli:v3.2.6,quay.io/argoproj/workflow-controller:v3.2.6,quay.io/bitnami/sealed-secrets-controller:v0.16.0,quay.io/keycloak/keycloak-operator:17.0.0,quay.io/kiali/kiali-operator:v1.45.1,quay.io/kiwigrid/k8s-sidecar:1.14.2,quay.io/prometheus-operator/prometheus-operator:v0.52.0,quay.io/prometheus/alertmanager:v0.23.0,quay.io/prometheus/node-exporter:v1.0.1,quay.io/prometheus/prometheus:v2.31.1,rancher/local-path-provisioner:v0.0.22,siim/logalert-exporter:v0.1.1,sktdev/cloud-console:v1.0.4,sktdev/os-eventrouter:69a58b'
 if [ $EXCEPTION_LIST ]; then
diff --git a/decapod-controller/base/resources.yaml b/decapod-controller/base/resources.yaml
index 6c6c9f2..0272417 100644
--- a/decapod-controller/base/resources.yaml
+++ b/decapod-controller/base/resources.yaml
@@ -9,7 +9,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: prepare-decapod-controller
     version: 0.1.0
   releaseName: db-secret-argo
@@ -31,7 +31,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: prepare-decapod-controller
     version: 0.1.0
   releaseName: db-secret-decapod-db
@@ -53,7 +53,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: postgresql
     version: 12.1.2
   releaseName: postgresql
@@ -85,7 +85,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: argo-workflows
     version: 0.2.6
   releaseName: argo-workflows-operator-crds
@@ -102,7 +102,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: argo-workflows
     version: 0.2.6
   releaseName: argo-workflows-operator
@@ -111,7 +111,7 @@ spec:
     server:
       serviceType: NodePort
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/argocli
         tag: v3.2.6
       extraArgs:
@@ -119,7 +119,7 @@ spec:
     controller:
       containerRuntimeExecutor: k8sapi
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/workflow-controller
         tag: v3.2.6
       persistence:
@@ -140,7 +140,7 @@ spec:
             key: postgresql-password
     executor:
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/argoexec
         tag: v3.2.6
   wait: true
diff --git a/deprecated_admin-tools/base/resources.yaml b/deprecated_admin-tools/base/resources.yaml
index 6838b2e..bc0e17f 100644
--- a/deprecated_admin-tools/base/resources.yaml
+++ b/deprecated_admin-tools/base/resources.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: keycloak-operator
     version: 0.1.0
     origin: https://openinfradev.github.io/helm-repo
@@ -26,7 +26,7 @@ metadata:
 spec:
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: keycloak-operator
     version: 0.1.0
     origin: https://openinfradev.github.io/helm-repo
@@ -43,7 +43,7 @@ metadata:
 spec:
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: keycloak-resources
     version: 0.1.0
     origin: https://openinfradev.github.io/helm-repo
diff --git a/deprecated_cloud-console/base/resources.yaml b/deprecated_cloud-console/base/resources.yaml
index 0b5de0e..0b50040 100755
--- a/deprecated_cloud-console/base/resources.yaml
+++ b/deprecated_cloud-console/base/resources.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: keycloak
     version: 8.2.2
     origin: https://codecentric.github.io/helm-charts
@@ -58,7 +58,7 @@ metadata:
 spec:
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: cloud-console
     version: 1.0.0
     origin: https://openinfradev.github.io/helm-repo
diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml
index 3bc7c21..e172888 100644
--- a/lma/base/resources.yaml
+++ b/lma/base/resources.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kube-prometheus-stack
     version: 44.3.1
     origin: https://prometheus-community.github.io/helm-charts
@@ -27,7 +27,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kube-prometheus-stack
     version: 44.3.1
     origin: https://prometheus-community.github.io/helm-charts
@@ -40,7 +40,7 @@ spec:
     global:
       rbac:
         create: true
-      imageRegistry: harbor-cicd.taco-cat.xyz
+      imageRegistry: harbor.taco-cat.xyz
     alertmanager:
       enabled: false
     grafana:
@@ -106,7 +106,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kube-prometheus-stack
     version: 44.3.1
     origin: https://prometheus-community.github.io/helm-charts
@@ -118,7 +118,7 @@ spec:
     global:
       rbac:
         create: true
-      imageRegistry: harbor-cicd.taco-cat.xyz
+      imageRegistry: harbor.taco-cat.xyz
     alertmanager:
       alertmanagerSpec:
         image:
@@ -296,7 +296,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: eck-operator
     version: 1.8.0
     origin: https://helm.elastic.co
@@ -304,7 +304,7 @@ spec:
   targetNamespace: elastic-system
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/eck-operator
+      repository: harbor.taco-cat.xyz/tks/eck-operator
       tag: 1.8.0
     installCRDs: true
     replicaCount: 1
@@ -336,7 +336,7 @@ spec:
     #    - https://github.com/kubernetes/kube-state-metrics/issues/1337
     #    - https://github.com/kubernetes/kube-state-metrics/issues/1342
     # so, i'll use bitnami before the issues are closed
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kube-state-metrics
     # version: 2.9.4
     version: 3.3.4
@@ -345,7 +345,7 @@ spec:
   targetNamespace: lma
   values:
     image:
-      registry: harbor-cicd.taco-cat.xyz
+      registry: harbor.taco-cat.xyz
       repository: tks/kube-state-metrics
     nodeSelector: {} # TO_BE_FIXED
   wait: true
@@ -360,7 +360,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: prometheus-node-exporter
     version: 4.13.0
     origin: https://prometheus-community.github.io/helm-charts
@@ -368,7 +368,7 @@ spec:
   targetNamespace: lma
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/node-exporter
+      repository: harbor.taco-cat.xyz/tks/node-exporter
       tag: v1.0.1
     # Expose the service to the host network
     hostNetwork: true
@@ -394,7 +394,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: prometheus-pushgateway
     version: 2.1.1
     origin: https://prometheus-community.github.io/helm-charts
@@ -402,7 +402,7 @@ spec:
   targetNamespace: lma
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/pushgateway
+      repository: harbor.taco-cat.xyz/tks/pushgateway
       tag: v1.3.0
     service:
       type: ClusterIP
@@ -419,7 +419,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: prometheus-process-exporter
     version: 0.1.4-skt
     skipDepUpdate: true
@@ -429,9 +429,9 @@ spec:
   values:
     images:
       tags:
-        dep_check: harbor-cicd.taco-cat.xyz/tks/kubernetes-entrypoint:v1.0.0
-        image_repo_sync: harbor-cicd.taco-cat.xyz/tks/docker:19.03
-        process_exporter: harbor-cicd.taco-cat.xyz/tks/process-exporter:0.2.11
+        dep_check: harbor.taco-cat.xyz/tks/kubernetes-entrypoint:v1.0.0
+        image_repo_sync: harbor.taco-cat.xyz/tks/docker:19.03
+        process_exporter: harbor.taco-cat.xyz/tks/process-exporter:0.2.11
     labels:
       process_exporter:
         process_selector_key: process-exporter
@@ -470,7 +470,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: eck-resource
     version: 1.1.1
     origin: https://openinfradev.github.io/helm-repo
@@ -479,7 +479,7 @@ spec:
   values:
     elasticsearch:
       image:
-        repository: harbor-cicd.taco-cat.xyz/tks/elasticsearch
+        repository: harbor.taco-cat.xyz/tks/elasticsearch
         tag: 7.5.1
       adminPassword: TO_BE_FIXED
       enabled: true
@@ -536,7 +536,7 @@ spec:
             size: 0.5Gi
     kibana:
       image:
-        repository: harbor-cicd.taco-cat.xyz/tks/kibana
+        repository: harbor.taco-cat.xyz/tks/kibana
         tag: 7.5.1
       enabled: true
       http:
@@ -566,7 +566,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: grafana
     version: 6.50.7
     origin: https://grafana.github.io/helm-charts
@@ -574,19 +574,19 @@ spec:
   targetNamespace: lma
   values:
     downloadDashboardsImage:
-      repository: harbor-cicd.taco-cat.xyz/tks/curl
+      repository: harbor.taco-cat.xyz/tks/curl
       tag: latest
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/grafana
+      repository: harbor.taco-cat.xyz/tks/grafana
       tag: 8.3.3
     initChownData:
       image:
-        repository: harbor-cicd.taco-cat.xyz/tks/busybox
+        repository: harbor.taco-cat.xyz/tks/busybox
         tag: latest
     adminPassword: password
     sidecar:
       image:
-        repository: harbor-cicd.taco-cat.xyz/tks/k8s-sidecar
+        repository: harbor.taco-cat.xyz/tks/k8s-sidecar
         tag: 1.14.2
       dashboards:
         enabled: true
@@ -595,7 +595,7 @@ spec:
         enabled: true
         label: grafana_datasource
     testFramework:
-      image: harbor-cicd.taco-cat.xyz/tks/bats
+      image: harbor.taco-cat.xyz/tks/bats
       tag: v1.4.1
     service:
       type: NodePort
@@ -623,7 +623,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: fluent-operator
     version: 1.7.0
     skipDepUpdate: true
@@ -643,7 +643,7 @@ spec:
   chart:
     type: helmrepo
     origin: https://openinfradev.github.io/helm-repo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: fluent-operator
     version: 1.7.0
     skipDepUpdate: true
@@ -652,10 +652,10 @@ spec:
   values:
     operator:
       initcontainer:
-        repository: harbor-cicd.taco-cat.xyz/tks/docker
+        repository: harbor.taco-cat.xyz/tks/docker
         tag: 19.03
       container:
-        repository: harbor-cicd.taco-cat.xyz/tks/fluent-operator
+        repository: harbor.taco-cat.xyz/tks/fluent-operator
         tag: v1.5.0
       # FluentBit operator resources. Usually user needn't to adjust these.
       resources:
@@ -667,7 +667,7 @@ spec:
           memory: 20Mi
     fluentbit:
       image:
-        repository: harbor-cicd.taco-cat.xyz/tks/fluent-bit
+        repository: harbor.taco-cat.xyz/tks/fluent-bit
         tag: v1.9.7-debug
   wait: true
 ---
@@ -681,7 +681,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: fluentbit-resource
     version: 1.3.0
     skipDepUpdate: true
@@ -692,13 +692,13 @@ spec:
     fullnameOverride: fbcr-taco
     image:
       exporter:
-        repository: harbor-cicd.taco-cat.xyz/tks/logalert-exporter
+        repository: harbor.taco-cat.xyz/tks/logalert-exporter
         tag: v0.1.1
       fluentbit:
-        repository: harbor-cicd.taco-cat.xyz/tks/fluent-bit
+        repository: harbor.taco-cat.xyz/tks/fluent-bit
         tag: v2.1.4
       elasticsearchTemplates:
-        repository: harbor-cicd.taco-cat.xyz/tks/curl
+        repository: harbor.taco-cat.xyz/tks/curl
         tag: latest
     fluentbit:
       enabled: true
@@ -755,7 +755,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: lma-addons
     version: 1.8.4
     origin: https://openinfradev.github.io/helm-repo
@@ -839,7 +839,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: prometheus-adapter
     version: 2.5.1
     origin: https://prometheus-community.github.io/helm-charts
@@ -847,7 +847,7 @@ spec:
   targetNamespace: lma
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/k8s-prometheus-adapter-amd64
+      repository: harbor.taco-cat.xyz/tks/k8s-prometheus-adapter-amd64
       image.tag: v0.7.0
     prometheus:
       url: http://lma-prometheus
@@ -867,7 +867,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kubernetes-event-exporter
     version: 2.0.1
     origin: https://openinfradev.github.io/helm-repo
@@ -876,10 +876,10 @@ spec:
   values:
     image:
       exporter:
-        repository: harbor-cicd.taco-cat.xyz/tks/kubernetes-event-exporter
+        repository: harbor.taco-cat.xyz/tks/kubernetes-event-exporter
         tag: v1.0
       sidecar:
-        repository: harbor-cicd.taco-cat.xyz/tks/fluent-bit
+        repository: harbor.taco-cat.xyz/tks/fluent-bit
         tag: 1.9.7-debug
 
     clustername: TO_BE_FIXED
@@ -898,7 +898,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: minio
     version: 5.0.4
     origin: https://charts.min.io
@@ -906,10 +906,10 @@ spec:
   targetNamespace: lma
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/minio
+      repository: harbor.taco-cat.xyz/tks/minio
       tag: RELEASE.2023-01-20T02-05-44Z
     mcImage:
-      repository: harbor-cicd.taco-cat.xyz/tks/mc
+      repository: harbor.taco-cat.xyz/tks/mc
       tag: RELEASE.2023-01-11T03-14-16Z
     users: [] # MUST_BE_DEFINED
     buckets: [] # MUST_BE_DEFINED
@@ -936,7 +936,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: thanos
     version: 12.3.2-skt
     origin: https://openinfradev.github.io/helm-repo
@@ -946,7 +946,7 @@ spec:
     global:
       storageClass: local-path
     image:
-      registry: harbor-cicd.taco-cat.xyz
+      registry: harbor.taco-cat.xyz
       repository: tks/thanos
       tag: v0.30.2
     clusterDomain: TO_BE_FIXED
@@ -1085,7 +1085,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: thanos-config
     version: 0.1.6
     origin: https://openinfradev.github.io/helm-repo
@@ -1121,7 +1121,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: prepare-etcd-secret
     version: 0.2.0
     origin: https://openinfradev.github.io/helm-repo
@@ -1129,7 +1129,7 @@ spec:
   targetNamespace: lma
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/hyperkube
+      repository: harbor.taco-cat.xyz/tks/hyperkube
       tag: v1.18.8
     etcd:
       certdir: /etc/kubernetes/pki/etcd
@@ -1161,7 +1161,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: loki-distributed
     version: 0.58.0
     origin: https://grafana.github.io/helm-charts
@@ -1173,7 +1173,7 @@ spec:
       dnsService: coredns
     loki:
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/loki
         tag: null
       schemaConfig:
@@ -1221,7 +1221,7 @@ spec:
     memcachedExporter.enabled: true
     gateway:
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/nginx-unprivileged
 
       nginxConfig:
@@ -1240,7 +1240,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: ack-resources
     version: v1.0.2
   releaseName: lma-bucket
diff --git a/sealed-secrets/base/resources.yaml b/sealed-secrets/base/resources.yaml
index 7a42e9f..9fe788a 100644
--- a/sealed-secrets/base/resources.yaml
+++ b/sealed-secrets/base/resources.yaml
@@ -9,7 +9,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: sealed-secrets
     version: 1.16.1
     origin: https://bitnami-labs.github.io/sealed-secrets
@@ -28,7 +28,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: sealed-secrets
     version: 1.16.1
     origin: https://bitnami-labs.github.io/sealed-secrets
@@ -37,7 +37,7 @@ spec:
   wait: true
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/sealed-secrets-controller
+      repository: harbor.taco-cat.xyz/tks/sealed-secrets-controller
 ---
 apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
@@ -49,7 +49,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kubed
     version: v0.12.0
     origin: https://charts.appscode.com/stable/
@@ -58,5 +58,5 @@ spec:
   wait: true
   values:
     operator:
-      registry: harbor-cicd.taco-cat.xyz
+      registry: harbor.taco-cat.xyz
       repository: tks/kubed
diff --git a/service-mesh/base/resources.yaml b/service-mesh/base/resources.yaml
index 78bb44b..55cb349 100644
--- a/service-mesh/base/resources.yaml
+++ b/service-mesh/base/resources.yaml
@@ -9,7 +9,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: cert-manager
     version: v1.11.0
     origin: https://charts.jetstack.io
@@ -29,7 +29,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: k8ssandra-operator
     version: 1.6.0
     origin: https://helm.k8ssandra.io/stable
@@ -48,7 +48,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: k8ssandra-operator
     version: 1.6.0
     origin: https://helm.k8ssandra.io/stable
@@ -57,12 +57,12 @@ spec:
   values:
     cleaner:
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/k8ssandra-tools
         tag: latest
     client:
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/k8ssandra-tools
         tag: latest
   wait: true
@@ -77,7 +77,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: servicemesh-k8ssandra-resource
     version: 1.6.0
     origin: https://helm.k8ssandra.io/stable
@@ -94,23 +94,23 @@ spec:
           enabled: true
       jmxInitContainerImage:
         name: busybox
-        registry: harbor-cicd.taco-cat.xyz/tks
+        registry: harbor.taco-cat.xyz/tks
         tag: 1.34.1
       datacenters:
         name: dc
         size: 2
-        perNodeConfigInitContainerImage: harbor-cicd.taco-cat.xyz/tks/yq:4
+        perNodeConfigInitContainerImage: harbor.taco-cat.xyz/tks/yq:4
         initContainers:
-          serverConfigInitImage: harbor-cicd.taco-cat.xyz/tks/cass-config-builder:1.0-ubi7
+          serverConfigInitImage: harbor.taco-cat.xyz/tks/cass-config-builder:1.0-ubi7
         jmxInitContainerImage:
           name: busybox
-          registry: harbor-cicd.taco-cat.xyz/tks
+          registry: harbor.taco-cat.xyz/tks
           tag: 1.34.1
         containers:
         - name: cassandra
-          image: harbor-cicd.taco-cat.xyz/tks/cass-management-api:4.0.6
+          image: harbor.taco-cat.xyz/tks/cass-management-api:4.0.6
         - name: server-system-logger
-          image: harbor-cicd.taco-cat.xyz/tks/system-logger:v1.14.0
+          image: harbor.taco-cat.xyz/tks/system-logger:v1.14.0
         config:
           heapSize: 2048M
         storageConfig:
@@ -138,7 +138,7 @@ spec:
             prometheus:
               enabled: true
           containerImage:
-            registry: harbor-cicd.taco-cat.xyz
+            registry: harbor.taco-cat.xyz
             repository: tks
             tag: v1.0.67
           nodeSelector:
@@ -155,7 +155,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: istio-base
     version: 1.17.2
     origin: https://istio-release.storage.googleapis.com/charts
@@ -176,7 +176,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: istio-base
     version: 1.17.2
     origin: https://istio-release.storage.googleapis.com/charts
@@ -197,7 +197,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: istiod
     version: 1.17.2
     origin: https://istio-release.storage.googleapis.com/charts
@@ -205,7 +205,7 @@ spec:
   targetNamespace: tks-msa
   values:
     pilot:
-      image: harbor-cicd.taco-cat.xyz/tks/pilot:1.17.2
+      image: harbor.taco-cat.xyz/tks/pilot:1.17.2
       traceSampling: 1.0
       resources:
         requests:
@@ -223,7 +223,7 @@ spec:
         limits:
           cpu: 2000m
           memory: 1024Mi
-      hub: harbor-cicd.taco-cat.xyz/tks
+      hub: harbor.taco-cat.xyz/tks
       tag: 1.17.2
       proxy:
         image: proxyv2
@@ -252,7 +252,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: istio-gateway
     version: 1.17.2
     origin: https://istio-release.storage.googleapis.com/charts
@@ -261,7 +261,7 @@ spec:
   values:
     revision: ""
     replicaCount: 1
-    image: harbor-cicd.taco-cat.xyz/tks/proxyv2:1.17.2
+    image: harbor.taco-cat.xyz/tks/proxyv2:1.17.2
     service:
       type: LoadBalancer
       ports:
@@ -312,7 +312,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: istio-gateway
     version: 1.17.2
     origin: https://istio-release.storage.googleapis.com/charts
@@ -321,7 +321,7 @@ spec:
   values:
     revision: ""
     replicaCount: 1
-    image: harbor-cicd.taco-cat.xyz/tks/proxyv2:1.17.2
+    image: harbor.taco-cat.xyz/tks/proxyv2:1.17.2
     service:
       type: ClusterIP
       ports:
@@ -372,7 +372,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: jaeger-operator
     version: 2.33.0
     origin: https://jaegertracing.github.io/helm-charts
@@ -391,7 +391,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     version: 2.33.0
     name: jaeger-operator
     origin: https://jaegertracing.github.io/helm-charts
@@ -399,7 +399,7 @@ spec:
   targetNamespace: tks-msa
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/jaeger-operator
+      repository: harbor.taco-cat.xyz/tks/jaeger-operator
       tag: 1.35.0
     jaeger:
       create: false
@@ -421,7 +421,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: servicemesh-jaeger-resource
     version: 2.33.0
     origin: https://openinfradev.github.io/helm-repo
@@ -435,7 +435,7 @@ spec:
     ingress:
       enabled: false
     collector:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-collector:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-collector:1.35.0
       maxReplicas: 5
       resources:
         requests:
@@ -465,7 +465,7 @@ spec:
           timeout: "3m"
         dependencies:
           enabled: true
-          image: harbor-cicd.taco-cat.xyz/tks/spark-dependencies:1.35.0
+          image: harbor.taco-cat.xyz/tks/spark-dependencies:1.35.0
       elastic:
         esIndexCleaner:
           enabled: true
@@ -480,7 +480,7 @@ spec:
           serverUrls: https://eck-elasticsearch-es-http.istio-system.svc:9200
           secretName: eck-elasticsearch-es-http-certs-public
     query:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-query:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-query:1.35.0
       basePath: /
       affinity:
         nodeAffinity:
@@ -492,20 +492,20 @@ spec:
                 values:
                 - enabled
     agent:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-agent:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-agent:1.35.0
     cassandra:
       user:
         enabled: true
         username: tks
         password: tksword
-      image: harbor-cicd.taco-cat.xyz/tks/shyaml_jq_kubectl_python:3.11
+      image: harbor.taco-cat.xyz/tks/shyaml_jq_kubectl_python:3.11
       imagePullPolicy: IfNotPresent
       passwordSecret: cassandra-superuser
       nodeSelector:
         tks-msa: enabled
     elasticsearch:
       image:
-        repository: harbor-cicd.taco-cat.xyz/tks/nginx-unprivileged
+        repository: harbor.taco-cat.xyz/tks/nginx-unprivileged
         tag: 1.19-alpine
         pullPolicy: IfNotPresent
       host: eck-elasticsearch-es-http.lma.svc.cluster.local
@@ -529,7 +529,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kiali-operator
     version: 1.63.0
     origin: https://kiali.org/helm-charts
@@ -548,7 +548,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kiali-operator
     version: 1.63.0
     origin: https://kiali.org/helm-charts
@@ -556,7 +556,7 @@ spec:
   targetNamespace: tks-msa
   values:
     image:
-      repo: harbor-cicd.taco-cat.xyz/tks/kiali-operator
+      repo: harbor.taco-cat.xyz/tks/kiali-operator
       tag: v1.63.0
     allowAdHocKialiImage: true
     nodeSelector:
@@ -582,7 +582,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: servicemesh-kiali-resource
     version: 1.63.0
     origin: https://openinfradev.github.io/helm-repo
@@ -595,7 +595,7 @@ spec:
       ingress:
         enabled: false
       namespace: tks-msa
-      image_name: harbor-cicd.taco-cat.xyz/tks/kiali
+      image_name: harbor.taco-cat.xyz/tks/kiali
       image_version: v1.63.0
       replicas: 1
       resources:
@@ -658,7 +658,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: servicemesh-grafana-dashboard
     version: 1.13.1
     origin: https://openinfradev.github.io/helm-repo
@@ -680,7 +680,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: servicemesh-prometheusmonitor
     version: 1.7.0
     origin: https://openinfradev.github.io/helm-repo
@@ -704,7 +704,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: servicemesh-prometheusrule
     version: 1.7.0
     origin: https://openinfradev.github.io/helm-repo
diff --git a/service-mesh/base/site-values.yaml b/service-mesh/base/site-values.yaml
index 2b19d45..0b3074a 100644
--- a/service-mesh/base/site-values.yaml
+++ b/service-mesh/base/site-values.yaml
@@ -6,7 +6,7 @@ metadata:
 global:
   clusterName: cluster.local
   namespace: tks-msa
-  imageRepo: harbor-cicd.taco-cat.xyz/tks
+  imageRepo: harbor.taco-cat.xyz/tks
   serviceMeshControlNodeSelector:
     tks-msa: enabled
   serviceMeshIngressNodeSelector:
@@ -24,12 +24,12 @@ charts:
   override:
     cleaner:
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/k8ssandra-tools
         tag: latest
     client:
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/k8ssandra-tools
         tag: latest
 
@@ -75,7 +75,7 @@ charts:
           size: 1
           heapSize: 384M
           containerImage:
-            registry: harbor-cicd.taco-cat.xyz
+            registry: harbor.taco-cat.xyz
             repository: tks
             tag: v1.0.67
           nodeSelector:
@@ -146,7 +146,7 @@ charts:
     collector.resources.limits.cpu: 1000m
     collector.resources.limits.memory: 2048Mi
     collector:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-collector:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-collector:1.35.0
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -164,9 +164,9 @@ charts:
           keyspace: jaeger_v1_datacenter
         dependencies:
           enabled: true
-          image: harbor-cicd.taco-cat.xyz/tks/spark-dependencies:1.35.0
+          image: harbor.taco-cat.xyz/tks/spark-dependencies:1.35.0
     query:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-query:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-query:1.35.0
       basePath: /
       affinity:
         nodeAffinity:
@@ -178,7 +178,7 @@ charts:
                 values:
                 - enabled
     agent:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-agent:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-agent:1.35.0
     cassandra:
       user:
         enabled: true
@@ -190,7 +190,7 @@ charts:
 - name: kiali-operator
   override:
     image:
-      repo: harbor-cicd.taco-cat.xyz/tks/kiali-operator
+      repo: harbor.taco-cat.xyz/tks/kiali-operator
       tag: v1.63.0
     nodeSelector: $(serviceMeshControlNodeSelector)
 
@@ -199,7 +199,7 @@ charts:
     namespace: tks-msa
     istioNamespace: tks-msa
     deployment.namespace: tks-msa
-    deployment.image_name: harbor-cicd.taco-cat.xyz/tks/kiali
+    deployment.image_name: harbor.taco-cat.xyz/tks/kiali
     deployment.image_version: v1.63.0
     deployment.resources.requests.cpu: 500m
     deployment.resources.requests.memory: 512Mi
diff --git a/tks-cluster/base/resources.yaml b/tks-cluster/base/resources.yaml
index c62646c..59566ef 100644
--- a/tks-cluster/base/resources.yaml
+++ b/tks-cluster/base/resources.yaml
@@ -8,7 +8,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: tigera-operator
     version: v3.25.0
   releaseName: tigera-operator-crds
@@ -26,7 +26,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: tigera-operator
     version: v3.25.0
     origin: https://docs.tigera.io/calico/charts
@@ -35,11 +35,11 @@ spec:
   values:
     tigeraOperator:
       image: tks/calico-operator
-      registry: harbor-cicd.taco-cat.xyz
+      registry: harbor.taco-cat.xyz
     calicoctl:
-      image: harbor-cicd.taco-cat.xyz/tks/calico-ctl
+      image: harbor.taco-cat.xyz/tks/calico-ctl
     installation:
-      registry: harbor-cicd.taco-cat.xyz/
+      registry: harbor.taco-cat.xyz/
       imagePath: tks
       imagePrefix: calico-
   wait: true
@@ -54,7 +54,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: local-path-provisioner
     version: 0.0.22
     origin: https://openinfradev.github.io/helm-repo
@@ -62,7 +62,7 @@ spec:
   targetNamespace: taco-system
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/local-path-provisioner
+      repository: harbor.taco-cat.xyz/tks/local-path-provisioner
     storageClass:
       name: taco-storage
   wait: true
@@ -77,7 +77,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: ingress-nginx
     version: 4.0.17
     origin: https://kubernetes.github.io/ingress-nginx
@@ -86,13 +86,13 @@ spec:
   values:
     controller:
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         image: tks/controller
         digest: ""
       admissionWebhooks:
         patch:
           image:
-            registry: harbor-cicd.taco-cat.xyz
+            registry: harbor.taco-cat.xyz
             image: tks/kube-webhook-certgen
             digest: ""
       replicaCount: 2
@@ -150,7 +150,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: kubed
     version: v0.12.0
     origin: https://charts.appscode.com/stable
@@ -170,7 +170,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: cluster-autoscaler
     version: 9.28.0
     origin: https://kubernetes.github.io/autoscaler
@@ -206,7 +206,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: cluster-autoscaler
     version: 0.2.0
     origin: https://openinfradev.github.io/helm-repo
@@ -229,7 +229,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: cluster-autoscaler
     version: 0.2.0
     origin: https://openinfradev.github.io/helm-repo
@@ -251,7 +251,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: metrics-server
     version: 3.8.2
     origin: https://kubernetes-sigs.github.io/metrics-server/
@@ -259,7 +259,7 @@ spec:
   targetNamespace: kube-system
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/metrics-server
+      repository: harbor.taco-cat.xyz/tks/metrics-server
       # a value 'tag' is guided in https://artifacthub.io/packages/helm/metrics-server/metrics-server but not applied on any template
       # tag: ""
       pullPolicy: IfNotPresent
@@ -276,7 +276,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: argo-rollouts
     version: 2.22.3
     origin: https://argoproj.github.io/argo-helm
@@ -288,7 +288,7 @@ spec:
         taco-lma: enabled
       replicas: 2
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/argo-rollouts
         tag: v1.4.1
     dashboard:
@@ -297,7 +297,7 @@ spec:
         taco-lma: enabled
       replicas: 1
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/kubectl-argo-rollouts
         tag: v1.4.1
   wait: true
diff --git a/tks-cluster/base/site-values.yaml b/tks-cluster/base/site-values.yaml
index f9d57a6..d76065e 100644
--- a/tks-cluster/base/site-values.yaml
+++ b/tks-cluster/base/site-values.yaml
@@ -35,6 +35,6 @@ charts:
         taco-lma: enabled
       replicas: 2
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/argo-rollouts
         tag: v1.4.1
diff --git a/tks-cluster/infra/aws/resources.yaml b/tks-cluster/infra/aws/resources.yaml
index a9a5f93..5d24e32 100644
--- a/tks-cluster/infra/aws/resources.yaml
+++ b/tks-cluster/infra/aws/resources.yaml
@@ -9,7 +9,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: cluster-api-aws
     version: 0.8.3
   releaseName: cluster-api-aws
@@ -49,33 +49,33 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: aws-ebs-csi-driver
     version: 2.6.4-skt
   releaseName: aws-ebs-csi-driver
   targetNamespace: kube-system
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/aws-ebs-csi-driver
+      repository: harbor.taco-cat.xyz/tks/aws-ebs-csi-driver
     sidecars:
       provisioner:
         image:
-          repository: harbor-cicd.taco-cat.xyz/tks/csi-provisioner
+          repository: harbor.taco-cat.xyz/tks/csi-provisioner
       attacher:
         image:
-          repository: harbor-cicd.taco-cat.xyz/tks/csi-attacher
+          repository: harbor.taco-cat.xyz/tks/csi-attacher
       snapshotter:
         image:
-          repository: harbor-cicd.taco-cat.xyz/tks/csi-snapshotter
+          repository: harbor.taco-cat.xyz/tks/csi-snapshotter
       livenessProbe:
         image:
-          repository: harbor-cicd.taco-cat.xyz/tks/livenessprobe
+          repository: harbor.taco-cat.xyz/tks/livenessprobe
       resizer:
         image:
-          repository: harbor-cicd.taco-cat.xyz/tks/csi-resizer
+          repository: harbor.taco-cat.xyz/tks/csi-resizer
       nodeDriverRegistrar:
         image:
-          repository: harbor-cicd.taco-cat.xyz/tks/csi-node-driver-registrar
+          repository: harbor.taco-cat.xyz/tks/csi-node-driver-registrar
     snapshotterSidecarEnabled: true
     storageClasses: 
     - name: taco-storage
@@ -104,7 +104,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: s3-chart
     version: v1.0.3
   releaseName: s3-chart-crds
@@ -121,14 +121,14 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: s3-chart 
     version: v1.0.3
   releaseName: s3-chart 
   targetNamespace: taco-system
   values:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/s3-controller  #public.ecr.aws/aws-controllers-k8s/s3-controller
+      repository: harbor.taco-cat.xyz/tks/s3-controller  #public.ecr.aws/aws-controllers-k8s/s3-controller
       tag: v1.0.3
     aws:
       region: ap-northeast-2
diff --git a/tks-cluster/infra/byoh/resources.yaml b/tks-cluster/infra/byoh/resources.yaml
index 6ff4eb1..6d9d2e3 100644
--- a/tks-cluster/infra/byoh/resources.yaml
+++ b/tks-cluster/infra/byoh/resources.yaml
@@ -9,7 +9,7 @@ spec:
   helmVersion: v3
   chart:
     type: helmrepo
-    repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
+    repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: cluster-api-byoh
     version: 0.1.0
   releaseName: cluster-api-byoh