diff --git a/argo-cd-apps/base/all-clusters/infra-deployments/external-secrets-operator/external-secrets-operator.yaml b/argo-cd-apps/base/all-clusters/infra-deployments/external-secrets-operator/external-secrets-operator.yaml
index 8f1b60ca96b..814f9e44d8b 100644
--- a/argo-cd-apps/base/all-clusters/infra-deployments/external-secrets-operator/external-secrets-operator.yaml
+++ b/argo-cd-apps/base/all-clusters/infra-deployments/external-secrets-operator/external-secrets-operator.yaml
@@ -13,15 +13,9 @@ spec:
               values:
                 sourceRoot: components/external-secrets-operator
                 environment: staging
-                clusterDir: "base"
+                clusterDir: ""
           - list:
-              elements:
-                - nameNormalized: stone-stage-p01
-                  values.clusterDir: stone-stage-p01
-                - nameNormalized: stone-stg-rh01
-                  values.clusterDir: stone-stg-rh01
-                - nameNormalized: pentest-p01
-                  values.clusterDir: pentest-p01
+              elements: []
   template:
     metadata:
       name: external-secrets-operator-{{nameNormalized}}
diff --git a/components/external-secrets-operator/helm-charts/custom-resources.yaml b/components/external-secrets-operator/base/custom-resources.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/custom-resources.yaml
rename to components/external-secrets-operator/base/custom-resources.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/Chart.lock b/components/external-secrets-operator/base/external-secrets/Chart.lock
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/Chart.lock
rename to components/external-secrets-operator/base/external-secrets/Chart.lock
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/Chart.yaml b/components/external-secrets-operator/base/external-secrets/Chart.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/Chart.yaml
rename to components/external-secrets-operator/base/external-secrets/Chart.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/README.md b/components/external-secrets-operator/base/external-secrets/README.md
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/README.md
rename to components/external-secrets-operator/base/external-secrets/README.md
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/NOTES.txt b/components/external-secrets-operator/base/external-secrets/templates/NOTES.txt
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/NOTES.txt
rename to components/external-secrets-operator/base/external-secrets/templates/NOTES.txt
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/_helpers.tpl b/components/external-secrets-operator/base/external-secrets/templates/_helpers.tpl
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/_helpers.tpl
rename to components/external-secrets-operator/base/external-secrets/templates/_helpers.tpl
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-deployment.yaml b/components/external-secrets-operator/base/external-secrets/templates/cert-controller-deployment.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-deployment.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/cert-controller-deployment.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-poddisruptionbudget.yaml b/components/external-secrets-operator/base/external-secrets/templates/cert-controller-poddisruptionbudget.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-poddisruptionbudget.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/cert-controller-poddisruptionbudget.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-rbac.yaml b/components/external-secrets-operator/base/external-secrets/templates/cert-controller-rbac.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-rbac.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/cert-controller-rbac.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-service.yaml b/components/external-secrets-operator/base/external-secrets/templates/cert-controller-service.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-service.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/cert-controller-service.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-serviceaccount.yaml b/components/external-secrets-operator/base/external-secrets/templates/cert-controller-serviceaccount.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/cert-controller-serviceaccount.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/cert-controller-serviceaccount.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/acraccesstoken.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/acraccesstoken.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/acraccesstoken.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/acraccesstoken.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/clusterexternalsecret.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/clusterexternalsecret.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/clusterexternalsecret.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/clusterexternalsecret.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/clustergenerator.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/clustergenerator.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/clustergenerator.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/clustergenerator.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/clustersecretstore.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/clustersecretstore.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/clustersecretstore.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/clustersecretstore.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/ecrauthorizationtoken.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/ecrauthorizationtoken.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/ecrauthorizationtoken.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/ecrauthorizationtoken.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/externalsecret.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/externalsecret.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/externalsecret.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/externalsecret.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/fake.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/fake.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/fake.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/fake.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/gcraccesstoken.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/gcraccesstoken.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/gcraccesstoken.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/gcraccesstoken.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/githubaccesstoken.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/githubaccesstoken.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/githubaccesstoken.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/githubaccesstoken.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/password.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/password.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/password.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/password.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/pushsecret.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/pushsecret.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/pushsecret.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/pushsecret.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/secretstore.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/secretstore.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/secretstore.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/secretstore.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/stssessiontoken.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/stssessiontoken.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/stssessiontoken.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/stssessiontoken.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/uuid.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/uuid.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/uuid.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/uuid.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/vaultdynamicsecret.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/vaultdynamicsecret.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/vaultdynamicsecret.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/vaultdynamicsecret.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/crds/webhook.yaml b/components/external-secrets-operator/base/external-secrets/templates/crds/webhook.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/crds/webhook.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/crds/webhook.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/deployment.yaml b/components/external-secrets-operator/base/external-secrets/templates/deployment.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/deployment.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/deployment.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/extra-manifests.yaml b/components/external-secrets-operator/base/external-secrets/templates/extra-manifests.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/extra-manifests.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/extra-manifests.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/poddisruptionbudget.yaml b/components/external-secrets-operator/base/external-secrets/templates/poddisruptionbudget.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/poddisruptionbudget.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/poddisruptionbudget.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/rbac.yaml b/components/external-secrets-operator/base/external-secrets/templates/rbac.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/rbac.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/rbac.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/service.yaml b/components/external-secrets-operator/base/external-secrets/templates/service.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/service.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/service.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/serviceaccount.yaml b/components/external-secrets-operator/base/external-secrets/templates/serviceaccount.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/serviceaccount.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/serviceaccount.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/servicemonitor.yaml b/components/external-secrets-operator/base/external-secrets/templates/servicemonitor.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/servicemonitor.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/servicemonitor.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/validatingwebhook.yaml b/components/external-secrets-operator/base/external-secrets/templates/validatingwebhook.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/validatingwebhook.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/validatingwebhook.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-certificate.yaml b/components/external-secrets-operator/base/external-secrets/templates/webhook-certificate.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-certificate.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/webhook-certificate.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-deployment.yaml b/components/external-secrets-operator/base/external-secrets/templates/webhook-deployment.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-deployment.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/webhook-deployment.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-poddisruptionbudget.yaml b/components/external-secrets-operator/base/external-secrets/templates/webhook-poddisruptionbudget.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-poddisruptionbudget.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/webhook-poddisruptionbudget.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-secret.yaml b/components/external-secrets-operator/base/external-secrets/templates/webhook-secret.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-secret.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/webhook-secret.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-service.yaml b/components/external-secrets-operator/base/external-secrets/templates/webhook-service.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-service.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/webhook-service.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-serviceaccount.yaml b/components/external-secrets-operator/base/external-secrets/templates/webhook-serviceaccount.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/templates/webhook-serviceaccount.yaml
rename to components/external-secrets-operator/base/external-secrets/templates/webhook-serviceaccount.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/values.schema.json b/components/external-secrets-operator/base/external-secrets/values.schema.json
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/values.schema.json
rename to components/external-secrets-operator/base/external-secrets/values.schema.json
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/values.yaml b/components/external-secrets-operator/base/external-secrets/values.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/external-secrets/values.yaml
rename to components/external-secrets-operator/base/external-secrets/values.yaml
diff --git a/components/external-secrets-operator/base/kustomization.yaml b/components/external-secrets-operator/base/kustomization.yaml
index a064608465a..0bf4b72c25f 100644
--- a/components/external-secrets-operator/base/kustomization.yaml
+++ b/components/external-secrets-operator/base/kustomization.yaml
@@ -1,6 +1,16 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-  - subscription.yaml
-  - operator-config.yaml
+
 namespace: external-secrets-operator
+
+resources:
+- custom-resources.yaml
+
+helmGlobals:
+  chartHome: .
+
+helmCharts:
+- name: external-secrets
+  releaseName: external-secrets-operator
+  namespace: external-secrets-operator
+  valuesFile: values.yaml
diff --git a/components/external-secrets-operator/base/operator-config.yaml b/components/external-secrets-operator/base/operator-config.yaml
deleted file mode 100644
index 2ff52a5eaec..00000000000
--- a/components/external-secrets-operator/base/operator-config.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-apiVersion: operator.external-secrets.io/v1alpha1
-kind: OperatorConfig
-metadata:
-  name: cluster
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-    argocd.argoproj.io/sync-wave: "-1"
-spec:
-  prometheus:
-    enabled: true
-    service:
-      port: 8080
-  resources:
-   requests:
-     cpu: 100m
-     memory: 512Mi
-   limits:
-     memory: 512Mi
-  certController:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 128Mi
-      limits:
-        memory: 128Mi
-  webhook:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 128Mi
-      limits:
-        memory: 128Mi
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: cluster-external-secrets-metrics
-  namespace: external-secrets-operator
-  annotations:
-    ignore-check.kube-linter.io/dangling-service: "False positive"
-  labels:
-    app.kubernetes.io/name: external-secrets
-    app.kubernetes.io/instance: cluster
-spec:
-  type: ClusterIP
-  ports:
-  - name: metrics
-    port: 8080
-    targetPort: 8080
-    protocol: TCP
-  selector:
-    app.kubernetes.io/name: external-secrets
-    app.kubernetes.io/instance: cluster
----
-
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: external-secrets-operator
-  namespace: external-secrets-operator
-spec:
-  endpoints:
-  - port: metrics
-    scheme: http
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: external-secrets
-      app.kubernetes.io/instance: cluster
diff --git a/components/external-secrets-operator/base/subscription.yaml b/components/external-secrets-operator/base/subscription.yaml
deleted file mode 100644
index 35143492d96..00000000000
--- a/components/external-secrets-operator/base/subscription.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-apiVersion: operators.coreos.com/v1
-kind: OperatorGroup
-metadata:
-  name: external-secrets-operator
-  annotations:
-    argocd.argoproj.io/sync-wave: "-3"
-spec:
-  targetNamespaces:
-  - external-secrets-operator
----
-apiVersion: operators.coreos.com/v1alpha1
-kind: Subscription
-metadata:
-  name: external-secrets-operator
-  annotations:
-    argocd.argoproj.io/sync-wave: "-2"
-spec:
-  channel: stable
-  installPlanApproval: Manual
-  name: external-secrets-operator
-  source: community-operators
-  sourceNamespace: openshift-marketplace
-  startingCSV: external-secrets-operator.v0.11.0
-  config:
-    resources:
-      requests:
-        memory: 128Mi
-        cpu: 100m
-      limits:
-        memory: 1Gi
diff --git a/components/external-secrets-operator/helm-charts/values.yaml b/components/external-secrets-operator/base/values.yaml
similarity index 100%
rename from components/external-secrets-operator/helm-charts/values.yaml
rename to components/external-secrets-operator/base/values.yaml
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/.helmignore b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/.helmignore
deleted file mode 100644
index 0e8a0eb36f4..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/Chart.yaml b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/Chart.yaml
deleted file mode 100644
index 64d6f38534e..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/Chart.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v2
-appVersion: v0.3.1
-description: A Helm chart for Kubernetes
-name: bitwarden-sdk-server
-type: application
-version: v0.3.1
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/NOTES.txt b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/NOTES.txt
deleted file mode 100644
index 46b671c6a30..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/NOTES.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "bitwarden-sdk-server.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "bitwarden-sdk-server.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "bitwarden-sdk-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "bitwarden-sdk-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/_helpers.tpl b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/_helpers.tpl
deleted file mode 100644
index a5e0da3cca2..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/_helpers.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "bitwarden-sdk-server.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "bitwarden-sdk-server.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "bitwarden-sdk-server.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "bitwarden-sdk-server.labels" -}}
-helm.sh/chart: {{ include "bitwarden-sdk-server.chart" . }}
-{{ include "bitwarden-sdk-server.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "bitwarden-sdk-server.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "bitwarden-sdk-server.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "bitwarden-sdk-server.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "bitwarden-sdk-server.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/deployment.yaml b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/deployment.yaml
deleted file mode 100644
index 06e28820a9b..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/deployment.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "bitwarden-sdk-server.fullname" . }}
-  labels:
-    {{- include "bitwarden-sdk-server.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "bitwarden-sdk-server.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "bitwarden-sdk-server.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "bitwarden-sdk-server.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          {{- if not .Values.image.tls.enabled }}
-          args:
-            - --insecure
-          {{- end }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if .Values.image.tls.enabled }}
-          volumeMounts:
-          {{- toYaml .Values.image.tls.volumeMounts | nindent 10 }}
-          {{- end}}
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /live
-              port: http
-              {{- if .Values.image.tls.enabled }}
-              scheme: HTTPS
-              {{- end }}
-          readinessProbe:
-            httpGet:
-              path: /ready
-              port: http
-              {{- if .Values.image.tls.enabled }}
-              scheme: HTTPS
-              {{- end }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.image.tls.enabled }}
-      volumes:
-      {{- toYaml .Values.image.tls.volumes | nindent 8 }}
-      {{- end}}
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/service.yaml b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/service.yaml
deleted file mode 100644
index 88e2d668b5f..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "bitwarden-sdk-server.fullname" . }}
-  labels:
-    {{- include "bitwarden-sdk-server.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      name: http
-  selector:
-    {{- include "bitwarden-sdk-server.selectorLabels" . | nindent 4 }}
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/serviceaccount.yaml b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/serviceaccount.yaml
deleted file mode 100644
index fef7bad653e..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "bitwarden-sdk-server.serviceAccountName" . }}
-  labels:
-    {{- include "bitwarden-sdk-server.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/tests/__snapshot__/deployment_test.yaml.snap b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/tests/__snapshot__/deployment_test.yaml.snap
deleted file mode 100644
index 2fbcdb118c9..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/tests/__snapshot__/deployment_test.yaml.snap
+++ /dev/null
@@ -1,60 +0,0 @@
-deployment should match snapshot:
-  1: |
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      labels:
-        app.kubernetes.io/instance: RELEASE-NAME
-        app.kubernetes.io/managed-by: Helm
-        app.kubernetes.io/name: bitwarden-sdk-server
-        app.kubernetes.io/version: 1.16.0
-        helm.sh/chart: bitwarden-sdk-server-0.1.0
-      name: bitwarden-sdk-server
-    spec:
-      replicas: 1
-      selector:
-        matchLabels:
-          app.kubernetes.io/instance: RELEASE-NAME
-          app.kubernetes.io/name: bitwarden-sdk-server
-      template:
-        metadata:
-          labels:
-            app.kubernetes.io/instance: RELEASE-NAME
-            app.kubernetes.io/name: bitwarden-sdk-server
-        spec:
-          containers:
-            - image: ghcr.io/external-secrets/bitwarden-sdk-server:v0.8.0
-              imagePullPolicy: IfNotPresent
-              livenessProbe:
-                httpGet:
-                  path: /live
-                  port: http
-                  scheme: HTTPS
-              name: bitwarden-sdk-server
-              ports:
-                - containerPort: 9998
-                  name: http
-                  protocol: TCP
-              readinessProbe:
-                httpGet:
-                  path: /ready
-                  port: http
-                  scheme: HTTPS
-              resources: {}
-              securityContext: {}
-              volumeMounts:
-                - mountPath: /certs
-                  name: bitwarden-tls-certs
-          securityContext: {}
-          serviceAccountName: bitwarden-sdk-server
-          volumes:
-            - name: bitwarden-tls-certs
-              secret:
-                items:
-                  - key: tls.crt
-                    path: cert.pem
-                  - key: tls.key
-                    path: key.pem
-                  - key: ca.crt
-                    path: ca.pem
-                secretName: bitwarden-tls-certs
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/tests/deployment_test.yaml b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/tests/deployment_test.yaml
deleted file mode 100644
index bb4e2f4f501..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/tests/deployment_test.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-suite: test deployment
-templates:
-  - deployment.yaml
-tests:
-  - it: deployment should match snapshot
-    set:
-      image.tag: v0.8.0
-    asserts:
-      - matchSnapshot: {}
diff --git a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/values.yaml b/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/values.yaml
deleted file mode 100644
index f0424afbad1..00000000000
--- a/components/external-secrets-operator/helm-charts/external-secrets/charts/bitwarden-sdk-server/values.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-# Default values for bitwarden-sdk-server.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: ghcr.io/external-secrets/bitwarden-sdk-server
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-  tls:
-    enabled: true
-    volumeMounts:
-      - mountPath: "/certs"
-        name: "bitwarden-tls-certs"
-    volumes:
-      - name: "bitwarden-tls-certs"
-        secret:
-          secretName: "bitwarden-tls-certs"
-          items:
-            - key: "tls.crt"
-              path: "cert.pem"
-            - key: "tls.key"
-              path: "key.pem"
-            - key: "ca.crt"
-              path: "ca.pem"
-
-imagePullSecrets: []
-nameOverride: "bitwarden-sdk-server"
-fullnameOverride: "bitwarden-sdk-server"
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 9998
-
-ingress:
-  enabled: false
-  className: ""
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
diff --git a/components/external-secrets-operator/helm-charts/kustomization.yaml b/components/external-secrets-operator/helm-charts/kustomization.yaml
deleted file mode 100644
index 0bf4b72c25f..00000000000
--- a/components/external-secrets-operator/helm-charts/kustomization.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: external-secrets-operator
-
-resources:
-- custom-resources.yaml
-
-helmGlobals:
-  chartHome: .
-
-helmCharts:
-- name: external-secrets
-  releaseName: external-secrets-operator
-  namespace: external-secrets-operator
-  valuesFile: values.yaml
diff --git a/components/external-secrets-operator/production/base/kustomization.yaml b/components/external-secrets-operator/production/kustomization.yaml
similarity index 83%
rename from components/external-secrets-operator/production/base/kustomization.yaml
rename to components/external-secrets-operator/production/kustomization.yaml
index 2333422e2d3..27bb5cb0b48 100644
--- a/components/external-secrets-operator/production/base/kustomization.yaml
+++ b/components/external-secrets-operator/production/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+  - ../base
diff --git a/components/external-secrets-operator/production/pentest-p01/kustomization.yaml b/components/external-secrets-operator/production/pentest-p01/kustomization.yaml
deleted file mode 100644
index de37bca4f84..00000000000
--- a/components/external-secrets-operator/production/pentest-p01/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ../../helm-charts
diff --git a/components/external-secrets-operator/staging/base/kustomization.yaml b/components/external-secrets-operator/staging/kustomization.yaml
similarity index 83%
rename from components/external-secrets-operator/staging/base/kustomization.yaml
rename to components/external-secrets-operator/staging/kustomization.yaml
index 2333422e2d3..27bb5cb0b48 100644
--- a/components/external-secrets-operator/staging/base/kustomization.yaml
+++ b/components/external-secrets-operator/staging/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+  - ../base
diff --git a/components/external-secrets-operator/staging/stone-stage-p01/kustomization.yaml b/components/external-secrets-operator/staging/stone-stage-p01/kustomization.yaml
deleted file mode 100644
index de37bca4f84..00000000000
--- a/components/external-secrets-operator/staging/stone-stage-p01/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ../../helm-charts
diff --git a/components/external-secrets-operator/staging/stone-stg-rh01/kustomization.yaml b/components/external-secrets-operator/staging/stone-stg-rh01/kustomization.yaml
deleted file mode 100644
index de37bca4f84..00000000000
--- a/components/external-secrets-operator/staging/stone-stg-rh01/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ../../helm-charts