diff --git a/keycloak-operator/templates/deploy-keycloak-operator.yaml b/keycloak-operator/templates/deploy-keycloak-operator.yaml
index 8937b000..9e2232ae 100644
--- a/keycloak-operator/templates/deploy-keycloak-operator.yaml
+++ b/keycloak-operator/templates/deploy-keycloak-operator.yaml
@@ -34,6 +34,10 @@ spec:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: "keycloak-operator"
+            - name: RELATED_IMAGE_KEYCLOAK
+              value: "{{ .Values.keycloakCrImage.repository }}:{{ .Values.keycloakCrImage.tag }}"
+            - name: RELATED_IMAGE_KEYCLOAK_INIT_CONTAINER
+              value: "{{ .Values.keycloakCrInitImage.repository }}:{{ .Values.keycloakCrInitImage.tag }}"
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/keycloak-operator/values.yaml b/keycloak-operator/values.yaml
index 4418d211..b23906c7 100644
--- a/keycloak-operator/values.yaml
+++ b/keycloak-operator/values.yaml
@@ -8,6 +8,14 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
+keycloakCrImage:
+  repository: quay.io/keycloak/keycloak
+  tag: 17.0.0-legacy
+
+keycloakCrInitImage:
+  repository: quay.io/keycloak/keycloak-init-container
+  tag: 17.0.0-legacy
+
 imagePullSecrets: []
 
 resources: {}
diff --git a/keycloak-resources/templates/keycloak-realm.yaml b/keycloak-resources/templates/keycloak-realm.yaml
index 68978649..f468fb82 100644
--- a/keycloak-resources/templates/keycloak-realm.yaml
+++ b/keycloak-resources/templates/keycloak-realm.yaml
@@ -12,5 +12,5 @@ spec:
     displayName: "{{ .displayName }}"
   instanceSelector:
     matchLabels:
-      app: "{{ .name }}"
+      app: "{{ .keycloakSelector }}"
 {{- end }}
diff --git a/keycloak-resources/templates/keycloak.yaml b/keycloak-resources/templates/keycloak.yaml
index f84b23fc..f3264a47 100644
--- a/keycloak-resources/templates/keycloak.yaml
+++ b/keycloak-resources/templates/keycloak.yaml
@@ -13,3 +13,4 @@ spec:
   {{- end }}
   externalAccess:
     enabled: {{ .Values.keycloak.externalAccessEnabled }}
+    host: {{ .Values.keycloak.externalAccessHost }}
diff --git a/keycloak-resources/values.yaml b/keycloak-resources/values.yaml
index 98687014..1762ceb6 100644
--- a/keycloak-resources/values.yaml
+++ b/keycloak-resources/values.yaml
@@ -13,10 +13,13 @@ keycloak:
     superuserEnabled: true
   storageClassName: storage # Valid only if externalDatabase is false
   externalAccessEnabled: false
+  externalAccessHost: CHANGEME
 
 keycloakRealm: []
 # - name: myrealm
 #   displayName: "My Realm"
+#   #tpl function doesn't work. Just put keycloak.name directly.
+#   keycloakSelector: {{ tpl .Values.keycloak.name . }}
 
 keycloakUser: []
 # - name: "myuser"