diff --git a/charts/kafka-operator/templates/operator-deployment-with-webhook.yaml b/charts/kafka-operator/templates/operator-deployment-with-webhook.yaml
index 87c28873b..c4e5db40c 100644
--- a/charts/kafka-operator/templates/operator-deployment-with-webhook.yaml
+++ b/charts/kafka-operator/templates/operator-deployment-with-webhook.yaml
@@ -156,7 +156,7 @@ spec:
           {{- if .Values.operator.developmentLogging }}
             - --development
           {{- end }}
-          image: "{{ .Values.operator.image.repository }}:{{ .Values.operator.image.tag }}"
+          image: "{{ .Values.operator.image.repository }}:{{ .Values.operator.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.operator.image.pullPolicy }}
           name: manager
           env:
diff --git a/charts/kafka-operator/templates/operator-rbac.yaml b/charts/kafka-operator/templates/operator-rbac.yaml
index a12ac00a2..b0cc0547b 100644
--- a/charts/kafka-operator/templates/operator-rbac.yaml
+++ b/charts/kafka-operator/templates/operator-rbac.yaml
@@ -190,22 +190,6 @@ rules:
   - update
   - patch
   - delete
-{{- if contains "0.7." .Values.operator.image.tag }}
-- apiGroups:
-  - certmanager.k8s.io
-  resources:
-  - issuers
-  - clusterissuers
-  - certificates
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-{{- else }}
 - apiGroups:
     - cert-manager.io
   resources:
@@ -232,7 +216,6 @@ rules:
   - patch
   - update
   - watch
-{{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/charts/kafka-operator/values.yaml b/charts/kafka-operator/values.yaml
index bd7e57093..bf9ed1d8c 100644
--- a/charts/kafka-operator/values.yaml
+++ b/charts/kafka-operator/values.yaml
@@ -12,7 +12,7 @@ operator:
   annotations: {}
   image:
     repository: ghcr.io/banzaicloud/kafka-operator
-    tag: v0.15.0
+    tag: ""
     pullPolicy: IfNotPresent
   vaultAddress: ""
   # vaultSecret containing a `ca.crt` key with the Vault CA Certificate