diff --git a/components/cluster-as-a-service/development/cluster-aas-operator-rbac.yaml b/components/cluster-as-a-service/base/cluster-aas-operator-rbac.yaml
similarity index 100%
rename from components/cluster-as-a-service/development/cluster-aas-operator-rbac.yaml
rename to components/cluster-as-a-service/base/cluster-aas-operator-rbac.yaml
diff --git a/components/cluster-as-a-service/base/clustertemplates.yaml b/components/cluster-as-a-service/base/clustertemplates.yaml
index ba3d5230b6f..7d430bc8837 100644
--- a/components/cluster-as-a-service/base/clustertemplates.yaml
+++ b/components/cluster-as-a-service/base/clustertemplates.yaml
@@ -30,7 +30,7 @@ spec:
       project: default
       source:
         chart: hypershift-aws-template
-        repoURL: https://konflux-ci.dev/cluster-template-charts/
+        repoURL: https://konflux-ci.dev/cluster-template-charts
         targetRevision: 0.1.9
         helm:
           parameters:
diff --git a/components/cluster-as-a-service/base/kustomization.yaml b/components/cluster-as-a-service/base/kustomization.yaml
index 6b590b25d5d..c231e9877c1 100644
--- a/components/cluster-as-a-service/base/kustomization.yaml
+++ b/components/cluster-as-a-service/base/kustomization.yaml
@@ -8,4 +8,5 @@ resources:
   - namespaces.yaml
   - rbac.yaml
   - clustertemplatequotas.yaml
+  - cluster-aas-operator-rbac.yaml
   - clustertemplates.yaml
diff --git a/components/cluster-as-a-service/development/add-hypershift-params.yaml b/components/cluster-as-a-service/development/add-hypershift-params.yaml
index 1621ca40bda..f3929030e33 100644
--- a/components/cluster-as-a-service/development/add-hypershift-params.yaml
+++ b/components/cluster-as-a-service/development/add-hypershift-params.yaml
@@ -17,10 +17,6 @@
     name: hypershiftRoleArn
     value: ""
 
-- op: replace
-  path: /spec/template/spec/source/repoURL
-  value: https://konflux-ci.dev/cluster-template-charts
-
 - op: replace
   path: /spec/template/spec/source/targetRevision
   value: 0.1.9
diff --git a/components/cluster-as-a-service/development/kustomization.yaml b/components/cluster-as-a-service/development/kustomization.yaml
index 2829c425b25..0b0db531ff1 100644
--- a/components/cluster-as-a-service/development/kustomization.yaml
+++ b/components/cluster-as-a-service/development/kustomization.yaml
@@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
-  - cluster-aas-operator-rbac.yaml
   - klusterlet-config.yaml
 patches:
   - path: add-hypershift-params.yaml
diff --git a/components/cluster-as-a-service/staging/add-hypershift-params.yaml b/components/cluster-as-a-service/staging/add-hypershift-params.yaml
index 69b26e07a40..b354aa32c61 100644
--- a/components/cluster-as-a-service/staging/add-hypershift-params.yaml
+++ b/components/cluster-as-a-service/staging/add-hypershift-params.yaml
@@ -17,10 +17,6 @@
     name: hypershiftRoleArn
     value: arn:aws:iam::767397671005:role/eaas-hypershift-cli-role
 
-- op: replace
-  path: /spec/template/spec/source/repoURL
-  value: https://konflux-ci.dev/cluster-template-charts
-
 - op: replace
   path: /spec/template/spec/source/targetRevision
   value: 0.1.9
diff --git a/components/cluster-as-a-service/staging/cluster-aas-operator-rbac.yaml b/components/cluster-as-a-service/staging/cluster-aas-operator-rbac.yaml
deleted file mode 100644
index 6ba6c851bbb..00000000000
--- a/components/cluster-as-a-service/staging/cluster-aas-operator-rbac.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: cluster-aas-operator-applicationset-manager
-  namespace: cluster-aas-operator
-rules:
-- apiGroups:
-  - argoproj.io
-  resources:
-  - applicationsets
-  verbs:
-  - delete
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: cluster-aas-operator-applicationset-manager
-  namespace: cluster-aas-operator
-subjects:
-- kind: ServiceAccount
-  name: cluster-aas-operator-controller-manager
-  namespace: openshift-operators
-roleRef:
-  kind: Role
-  name: cluster-aas-operator-applicationset-manager
-  apiGroup: rbac.authorization.k8s.io
diff --git a/components/cluster-as-a-service/staging/kustomization.yaml b/components/cluster-as-a-service/staging/kustomization.yaml
index 594e73dd6f5..19744dd24f9 100644
--- a/components/cluster-as-a-service/staging/kustomization.yaml
+++ b/components/cluster-as-a-service/staging/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 resources:
   - ../base
   - ../../openshift-gitops
-  - cluster-aas-operator-rbac.yaml
   - external-secrets.yaml
 patches:
   - path: add-hypershift-params.yaml