diff --git a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml
index 4c68c0b..15a0645 100644
--- a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml
@@ -102,8 +102,8 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Modernization & Migration
     certified: "false"
-    containerImage: quay.io/konveyor/tackle2-operator:latest
-    createdAt: "2024-08-19T17:42:17Z"
+    containerImage: docker.io/fabianvf/tackle2-operator:latest
+    createdAt: "2024-09-12T17:25:00Z"
     description: Konveyor is an open-source application modernization platform that
       helps organizations safely and predictably modernize applications to Kubernetes
       at scale.
@@ -294,7 +294,7 @@ spec:
                   value: quay.io/konveyor/java-external-provider:latest
                 - name: RELATED_IMAGE_KAI
                   value: quay.io/konveyor/kai:latest
-                image: quay.io/konveyor/tackle2-operator:latest
+                image: docker.io/fabianvf/tackle2-operator:latest
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
diff --git a/roles/tackle/templates/kai/kai-api-deployment.yaml.j2 b/roles/tackle/templates/kai/kai-api-deployment.yaml.j2
index 6560ec8..7a3c793 100644
--- a/roles/tackle/templates/kai/kai-api-deployment.yaml.j2
+++ b/roles/tackle/templates/kai/kai-api-deployment.yaml.j2
@@ -23,22 +23,22 @@ spec:
             - name: KAI__INCIDENT_STORE__ARGS__HOST
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_HOST
             - name: KAI__INCIDENT_STORE__ARGS__DATABASE
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_DATABASE
             - name: KAI__INCIDENT_STORE__ARGS__PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_PASSWORD
             - name: KAI__INCIDENT_STORE__ARGS__USER
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_USER
             - name: KAI__DEMO_MODE
               value: "False"
diff --git a/roles/tackle/templates/kai/kai-db-deployment.yaml.j2 b/roles/tackle/templates/kai/kai-db-deployment.yaml.j2
index 4fc61b8..8d4c269 100644
--- a/roles/tackle/templates/kai/kai-db-deployment.yaml.j2
+++ b/roles/tackle/templates/kai/kai-db-deployment.yaml.j2
@@ -21,17 +21,17 @@ spec:
             - name: POSTGRESQL_DATABASE
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_DATABASE
             - name: POSTGRESQL_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_PASSWORD
             - name: POSTGRESQL_USER
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_USER
           volumeMounts:
             - mountPath: /var/lib/postgresql/data
diff --git a/roles/tackle/templates/kai/kai-importer-deployment.yaml.j2 b/roles/tackle/templates/kai/kai-importer-deployment.yaml.j2
index b16e99c..ce3797d 100644
--- a/roles/tackle/templates/kai/kai-importer-deployment.yaml.j2
+++ b/roles/tackle/templates/kai/kai-importer-deployment.yaml.j2
@@ -23,22 +23,22 @@ spec:
             - name: KAI__INCIDENT_STORE__ARGS__HOST
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_HOST
             - name: KAI__INCIDENT_STORE__ARGS__DATABASE
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_DATABASE
             - name: KAI__INCIDENT_STORE__ARGS__PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_PASSWORD
             - name: KAI__INCIDENT_STORE__ARGS__USER
               valueFrom:
                 secretKeyRef:
-                  name: "{{ kai_db_secret_name }}"
+                  name: "{{ kai_database_secret_name }}"
                   key: POSTGRESQL_USER
             - name: KAI__DEMO_MODE
               value: "False"