diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3ae6060..f293275b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,12 @@ All notable changes to this project will be documented in this file.
 
 - Aggregate emitted Kubernetes events on the CustomResources ([#267]).
 
+### Changed
+
+- Default to OCI for image metadata ([#268]).
+
 [#267]: https://github.com/stackabletech/listener-operator/pull/267
+[#268]: https://github.com/stackabletech/listener-operator/pull/268
 
 ## [24.11.1] - 2025-01-10
 
diff --git a/Cargo.lock b/Cargo.lock
index 81135485..854a3de2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2518,8 +2518,8 @@ dependencies = [
 
 [[package]]
 name = "stackable-operator"
-version = "0.84.1"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac"
+version = "0.85.0"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d"
 dependencies = [
  "chrono",
  "clap",
@@ -2557,7 +2557,7 @@ dependencies = [
 [[package]]
 name = "stackable-operator-derive"
 version = "0.3.1"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2568,7 +2568,7 @@ dependencies = [
 [[package]]
 name = "stackable-shared"
 version = "0.0.1"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d"
 dependencies = [
  "kube",
  "semver",
diff --git a/Cargo.toml b/Cargo.toml
index 7c3149a6..279cc7ad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ prost = "0.13"
 prost-types = "0.13"
 serde = "1.0"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" }
 strum = { version = "0.26", features = ["derive"] }
 socket2 = { version = "0.5", features = ["all"] }
 tokio = { version = "1.40", features = ["full"] }
diff --git a/deploy/helm/listener-operator/values.yaml b/deploy/helm/listener-operator/values.yaml
index d0ba3c6c..fcd258d2 100644
--- a/deploy/helm/listener-operator/values.yaml
+++ b/deploy/helm/listener-operator/values.yaml
@@ -1,13 +1,13 @@
 # Default values for listener-operator.
 ---
 image:
-  repository: docker.stackable.tech/stackable/listener-operator
+  repository: oci.stackable.tech/sdp/listener-operator
   pullPolicy: IfNotPresent
   pullSecrets: []
 
 csiProvisioner:
   image:
-    repository: docker.stackable.tech/k8s/sig-storage/csi-provisioner
+    repository: oci.stackable.tech/sdp/sig-storage/csi-provisioner
     tag: v5.1.0
     pullPolicy: IfNotPresent
   resources:
@@ -19,7 +19,7 @@ csiProvisioner:
       memory: 128Mi
 csiNodeDriverRegistrar:
   image:
-    repository: docker.stackable.tech/k8s/sig-storage/csi-node-driver-registrar
+    repository: oci.stackable.tech/sdp/sig-storage/csi-node-driver-registrar
     tag: v2.13.0
     pullPolicy: IfNotPresent
   resources:
diff --git a/tests/templates/kuttl/smoke-nodeport/20-validate-all-ingresses-are-reachable.yaml.j2 b/tests/templates/kuttl/smoke-nodeport/20-validate-all-ingresses-are-reachable.yaml.j2
index 8d2ccfda..8df393d3 100644
--- a/tests/templates/kuttl/smoke-nodeport/20-validate-all-ingresses-are-reachable.yaml.j2
+++ b/tests/templates/kuttl/smoke-nodeport/20-validate-all-ingresses-are-reachable.yaml.j2
@@ -47,7 +47,7 @@ spec:
       serviceAccountName: query-ingresses-sa
       containers:
         - name: query-ingresses
-          image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
 # NOTE: Hostname resolution does not work on our OKD clusters, so the command for testing the Hostname is omitted on Openshift. It would be better to omit this entire test value for Openshift but this is not (yet) possible in beku.
 {% if test_scenario['values']['openshift'] == 'true' and test_scenario['values']['addressType'] != "Hostname" %}
           command: