diff --git a/charts/openstack-hypervisor-operator/templates/deployment.yaml b/charts/openstack-hypervisor-operator/templates/deployment.yaml
index afabbe82..a4bda03f 100644
--- a/charts/openstack-hypervisor-operator/templates/deployment.yaml
+++ b/charts/openstack-hypervisor-operator/templates/deployment.yaml
@@ -39,6 +39,8 @@ spec:
             secretKeyRef:
               key: SERVICE_PASSWORD
               name: {{ include "openstack-hypervisor-operator.fullname" . }}-secret
+        - name: CERTIFICATE_ISSUER_NAME
+          value: {{ quote .Values.controllerManager.manager.env.certificateIssuerName }}
         - name: LABEL_SELECTOR
           value: {{ quote .Values.controllerManager.manager.env.labelSelector }}
         - name: KUBERNETES_CLUSTER_DOMAIN
diff --git a/charts/openstack-hypervisor-operator/values.yaml b/charts/openstack-hypervisor-operator/values.yaml
index 5dfedaf2..a859cd8e 100644
--- a/charts/openstack-hypervisor-operator/values.yaml
+++ b/charts/openstack-hypervisor-operator/values.yaml
@@ -4,6 +4,7 @@ controllerManager:
     - --metrics-bind-address=:8443
     - --leader-elect
     - --health-probe-bind-address=:8081
+    - --certificate-issuer-name=${CERTIFICATE_ISSUER_NAME}
     - --label-selector=${LABEL_SELECTOR}
     containerSecurityContext:
       allowPrivilegeEscalation: false
@@ -11,6 +12,7 @@ controllerManager:
         drop:
         - ALL
     env:
+      certificateIssuerName: ""
       labelSelector: ""
       osAuthUrl: ""
       osProjectDomainName: ""
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index e20ce8d0..666ba653 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -61,6 +61,7 @@ spec:
       - args:
           - --leader-elect
           - --health-probe-bind-address=:8081
+          - --certificate-issuer-name=${CERTIFICATE_ISSUER_NAME}
           - --label-selector=${LABEL_SELECTOR}
         env:
           - name: OS_AUTH_URL
@@ -74,6 +75,7 @@ spec:
               secretKeyRef:
                 name: secret
                 key: SERVICE_PASSWORD
+          - name: CERTIFICATE_ISSUER_NAME
           - name: LABEL_SELECTOR
         image: keppel.eu-de-1.cloud.sap/ccloud/openstack-hypervisor-operator:latest
         name: manager