diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
index a78a4a5da..1bedd93e3 100644
--- a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
@@ -436,6 +436,13 @@ spec:
       - description: TLS - overrides tls parameters for public endpoint
         displayName: TLS
         path: telemetry.aodhApiOverride.tls
+      - description: CloudKittyAPIOverride, provides the ability to override the generated
+          manifest of several child resources.
+        displayName: Cloud Kitty APIOverride
+        path: telemetry.cloudKittyApiOverride
+      - description: TLS - overrides tls parameters for public endpoint
+        displayName: TLS
+        path: telemetry.cloudKittyApiOverride.tls
       - description: Enabled - Whether OpenStack Telemetry services should be deployed
           and managed
         displayName: Enabled
diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml
index bfbbe114b..ee30e2ca3 100644
--- a/config/operator/default_images.yaml
+++ b/config/operator/default_images.yaml
@@ -12,9 +12,9 @@ spec:
       - name: operator
         env:
         - name: RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT
-          value: quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:latest
+          value: quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:18.0-fr4-latest
         - name: RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT
-          value: quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest
+          value: quay.io/openstack-k8s-operators/openstack-ansibleee-runner:18.0-fr4-latest
         - name: RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified
         - name: RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT
@@ -199,7 +199,7 @@ spec:
         - name: TEST_HORIZONTEST_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-horizontest:current-podified
         - name: RELATED_IMAGE_OPENSTACK_MUST_GATHER_DEFAULT
-          value: quay.io/openstack-k8s-operators/openstack-must-gather:latest
+          value: quay.io/openstack-k8s-operators/openstack-must-gather:18.0-fr4-latest
           # will already be part of relatedImages as it is also directly set in the deployment in the
           # bundle CSV. We also need an environment variable here to propagate this to the
           # controller-manager and to other operators that require the same image to be set