diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86c8a611..01943097 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,10 +18,12 @@ All notable changes to this project will be documented in this file.
   This helps with setups where configOverrides are used to enable security on the HTTP interfaces.
   As this results in `401` HTTP responses (instead of `200`), this previously failed the liveness checks.
 - Set the JVM argument `-Xms` in addition to `-Xmx` (with the same value). This ensure consistent JVM configs across our products ([#636]).
+- Default to OCI for image metadata and product image selection ([#640]).
 
 [#619]: https://github.com/stackabletech/hdfs-operator/pull/619
 [#629]: https://github.com/stackabletech/hdfs-operator/pull/629
 [#636]: https://github.com/stackabletech/hdfs-operator/pull/636
+[#640]: https://github.com/stackabletech/hdfs-operator/pull/640
 [#643]: https://github.com/stackabletech/hdfs-operator/pull/643
 
 ## [24.11.1] - 2025-01-10
diff --git a/Cargo.lock b/Cargo.lock
index 36009cb6..ff58a6d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2372,8 +2372,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",
@@ -2411,7 +2411,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",
@@ -2422,7 +2422,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.nix b/Cargo.nix
index 16b4d2b0..e1331e73 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -7396,13 +7396,13 @@ rec {
       };
       "stackable-operator" = rec {
         crateName = "stackable-operator";
-        version = "0.84.1";
+        version = "0.85.0";
         edition = "2021";
         workspace_member = null;
         src = pkgs.fetchgit {
           url = "https://github.com/stackabletech/operator-rs.git";
-          rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac";
-          sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i";
+          rev = "59506c6202778889a27b6ae8153457e60a49c68d";
+          sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5";
         };
         libName = "stackable_operator";
         authors = [
@@ -7561,8 +7561,8 @@ rec {
         workspace_member = null;
         src = pkgs.fetchgit {
           url = "https://github.com/stackabletech/operator-rs.git";
-          rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac";
-          sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i";
+          rev = "59506c6202778889a27b6ae8153457e60a49c68d";
+          sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5";
         };
         procMacro = true;
         libName = "stackable_operator_derive";
@@ -7596,8 +7596,8 @@ rec {
         workspace_member = null;
         src = pkgs.fetchgit {
           url = "https://github.com/stackabletech/operator-rs.git";
-          rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac";
-          sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i";
+          rev = "59506c6202778889a27b6ae8153457e60a49c68d";
+          sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5";
         };
         libName = "stackable_shared";
         authors = [
diff --git a/Cargo.toml b/Cargo.toml
index 077475e3..84c76fd0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 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" }
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
diff --git a/crate-hashes.json b/crate-hashes.json
index a0346ddb..290d87f2 100644
--- a/crate-hashes.json
+++ b/crate-hashes.json
@@ -1,6 +1,6 @@
 {
-  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-operator-derive@0.3.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i",
-  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-operator@0.84.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i",
-  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-shared@0.0.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-operator-derive@0.3.1": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-operator@0.85.0": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-shared@0.0.1": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5",
   "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny"
 }
\ No newline at end of file
diff --git a/deploy/helm/hdfs-operator/crds/crds.yaml b/deploy/helm/hdfs-operator/crds/crds.yaml
index 87731606..f2840821 100644
--- a/deploy/helm/hdfs-operator/crds/crds.yaml
+++ b/deploy/helm/hdfs-operator/crds/crds.yaml
@@ -734,7 +734,7 @@ spec:
                     Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details.
                   properties:
                     custom:
-                      description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
+                      description: Overwrite the docker image. Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
                       type: string
                     productVersion:
                       description: Version of the product, e.g. `1.4.1`.
@@ -761,7 +761,7 @@ spec:
                       nullable: true
                       type: array
                     repo:
-                      description: Name of the docker repo, e.g. `docker.stackable.tech/stackable`
+                      description: Name of the docker repo, e.g. `oci.stackable.tech/sdp`
                       nullable: true
                       type: string
                     stackableVersion:
diff --git a/deploy/helm/hdfs-operator/values.yaml b/deploy/helm/hdfs-operator/values.yaml
index 3849683d..5bfd70b5 100644
--- a/deploy/helm/hdfs-operator/values.yaml
+++ b/deploy/helm/hdfs-operator/values.yaml
@@ -1,7 +1,7 @@
 # Default values for hdfs-operator.
 ---
 image:
-  repository: docker.stackable.tech/stackable/hdfs-operator
+  repository: oci.stackable.tech/sdp/hdfs-operator
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/docs/modules/hdfs/examples/getting_started/webhdfs.yaml b/docs/modules/hdfs/examples/getting_started/webhdfs.yaml
index f33c9332..855d8280 100644
--- a/docs/modules/hdfs/examples/getting_started/webhdfs.yaml
+++ b/docs/modules/hdfs/examples/getting_started/webhdfs.yaml
@@ -18,6 +18,6 @@ spec:
     spec:
       containers:
         - name: webhdfs
-          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
           stdin: true
           tty: true
diff --git a/docs/modules/hdfs/pages/reference/environment-variables.adoc b/docs/modules/hdfs/pages/reference/environment-variables.adoc
index 558666bb..875bc3a7 100644
--- a/docs/modules/hdfs/pages/reference/environment-variables.adoc
+++ b/docs/modules/hdfs/pages/reference/environment-variables.adoc
@@ -30,7 +30,7 @@ docker run \
 --env KUBECONFIG=/home/stackable/.kube/config \
 --env KUBERNETES_CLUSTER_DOMAIN=mycluster.local \
 --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
-docker.stackable.tech/stackable/hdfs-operator:latest
+oci.stackable.tech/sdp/hdfs-operator:0.0.0-dev
 ----
 
 == PRODUCT_CONFIG
@@ -56,7 +56,7 @@ docker run \
     --env KUBECONFIG=/home/stackable/.kube/config \
     --env PRODUCT_CONFIG=/my/product/config.yaml \
     --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
-    docker.stackable.tech/stackable/hdfs-operator:latest
+    oci.stackable.tech/sdp/hdfs-operator:0.0.0-dev
 ----
 
 == WATCH_NAMESPACE
@@ -85,5 +85,5 @@ docker run \
 --env KUBECONFIG=/home/stackable/.kube/config \
 --env WATCH_NAMESPACE=test \
 --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
-docker.stackable.tech/stackable/hdfs-operator:latest
+oci.stackable.tech/sdp/hdfs-operator:0.0.0-dev
 ----
diff --git a/docs/modules/hdfs/pages/usage-guide/fuse.adoc b/docs/modules/hdfs/pages/usage-guide/fuse.adoc
index 41a02ea5..2e342afd 100644
--- a/docs/modules/hdfs/pages/usage-guide/fuse.adoc
+++ b/docs/modules/hdfs/pages/usage-guide/fuse.adoc
@@ -21,7 +21,7 @@ spec:
       env:
         - name: HADOOP_CONF_DIR
           value: /stackable/conf/hdfs
-      image: docker.stackable.tech/stackable/hadoop:<version> <1>
+      image: oci.stackable.tech/sdp/hadoop:<version> <1>
       imagePullPolicy: Always
       securityContext:
         privileged: true
diff --git a/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2 b/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2
index 88357f39..56c072a7 100644
--- a/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2
+++ b/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: test-sa
       initContainers:
         - name: init
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - sh
             - -euo
@@ -36,7 +36,7 @@ spec:
               name: data
       containers:
         - name: kdc
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - krb5kdc
             - -n
@@ -54,7 +54,7 @@ spec:
             runAsUser: 0
 {% endif %}
         - name: kadmind
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - kadmind
             - -nofork
@@ -72,7 +72,7 @@ spec:
             runAsUser: 0
 {% endif %}
         - name: client
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           tty: true
           stdin: true
           env:
diff --git a/tests/templates/kuttl/kerberos/30-access-hdfs.txt.j2 b/tests/templates/kuttl/kerberos/30-access-hdfs.txt.j2
index 5864960e..19a63060 100644
--- a/tests/templates/kuttl/kerberos/30-access-hdfs.txt.j2
+++ b/tests/templates/kuttl/kerberos/30-access-hdfs.txt.j2
@@ -12,7 +12,7 @@ spec:
 {% if test_scenario['values']['hadoop'].find(",") > 0 %}
           image: "{{ test_scenario['values']['hadoop'].split(',')[1] }}"
 {% else %}
-          image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/hadoop:{{ test_scenario['values']['hadoop'] }}-stackable0.0.0-dev
 {% endif %}
           env:
             - name: HADOOP_CONF_DIR
diff --git a/tests/templates/kuttl/kerberos/32-check-file.txt.j2 b/tests/templates/kuttl/kerberos/32-check-file.txt.j2
index 84ce4b5a..7e0f1d5f 100644
--- a/tests/templates/kuttl/kerberos/32-check-file.txt.j2
+++ b/tests/templates/kuttl/kerberos/32-check-file.txt.j2
@@ -12,7 +12,7 @@ spec:
 {% if test_scenario['values']['hadoop'].find(",") > 0 %}
           image: "{{ test_scenario['values']['hadoop'].split(',')[1] }}"
 {% else %}
-          image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/hadoop:{{ test_scenario['values']['hadoop'] }}-stackable0.0.0-dev
 {% endif %}
           env:
             - name: HADOOP_CONF_DIR
diff --git a/tests/templates/kuttl/logging/06-install-hdfs-test-runner.yaml b/tests/templates/kuttl/logging/06-install-hdfs-test-runner.yaml
index eb25b6d5..f65ebe61 100644
--- a/tests/templates/kuttl/logging/06-install-hdfs-test-runner.yaml
+++ b/tests/templates/kuttl/logging/06-install-hdfs-test-runner.yaml
@@ -18,7 +18,7 @@ spec:
       shareProcessNamespace: true
       containers:
         - name: hdfs-test-runner
-          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
           args: [sleep, infinity]
           stdin: true
           tty: true
diff --git a/tests/templates/kuttl/profiling/04-install-test-container.yaml b/tests/templates/kuttl/profiling/04-install-test-container.yaml
index 11a4f295..4ee8e60f 100644
--- a/tests/templates/kuttl/profiling/04-install-test-container.yaml
+++ b/tests/templates/kuttl/profiling/04-install-test-container.yaml
@@ -26,7 +26,7 @@ spec:
         fsGroup: 1000
       containers:
         - name: python
-          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
           stdin: true
           tty: true
           resources:
diff --git a/tests/templates/kuttl/smoke/40-install-test-runner.yaml b/tests/templates/kuttl/smoke/40-install-test-runner.yaml
index cc1f296b..32d3ffa3 100644
--- a/tests/templates/kuttl/smoke/40-install-test-runner.yaml
+++ b/tests/templates/kuttl/smoke/40-install-test-runner.yaml
@@ -18,7 +18,7 @@ spec:
       shareProcessNamespace: true
       containers:
         - name: test-runner
-          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
           args: [sleep, infinity]
           stdin: true
           tty: true
diff --git a/tests/templates/kuttl/topology-provider/01-install-krb5-kdc.yaml.j2 b/tests/templates/kuttl/topology-provider/01-install-krb5-kdc.yaml.j2
index 6f9ed90c..d5172b3a 100644
--- a/tests/templates/kuttl/topology-provider/01-install-krb5-kdc.yaml.j2
+++ b/tests/templates/kuttl/topology-provider/01-install-krb5-kdc.yaml.j2
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: test-sa
       initContainers:
         - name: init
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - sh
             - -euo
@@ -36,7 +36,7 @@ spec:
               name: data
       containers:
         - name: kdc
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - krb5kdc
             - -n
@@ -54,7 +54,7 @@ spec:
             runAsUser: 0
 {% endif %}
         - name: kadmind
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - kadmind
             - -nofork
@@ -67,7 +67,7 @@ spec:
             - mountPath: /var/kerberos/krb5kdc
               name: data
         - name: client
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           tty: true
           stdin: true
           env:
diff --git a/tests/templates/kuttl/topology-provider/20-access-hdfs.yaml.j2 b/tests/templates/kuttl/topology-provider/20-access-hdfs.yaml.j2
index 160985ca..8597feb9 100644
--- a/tests/templates/kuttl/topology-provider/20-access-hdfs.yaml.j2
+++ b/tests/templates/kuttl/topology-provider/20-access-hdfs.yaml.j2
@@ -18,7 +18,7 @@ commands:
 {% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
                 image: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
 {% else %}
-                image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev
+                image: oci.stackable.tech/sdp/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev
 {% endif %}
                 env:
                   - name: HADOOP_CONF_DIR
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 9ddcc5e4..0ad92a5a 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -6,12 +6,12 @@ dimensions:
       - 3.3.6
       - 3.4.0
       # To use a custom image, add a comma and the full name after the product version
-      # - 3.4.0,docker.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev
+      # - 3.4.0,oci.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev
   - name: hadoop-latest
     values:
       - 3.4.0
       # To use a custom image, add a comma and the full name after the product version
-      # - 3.4.0,docker.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev
+      # - 3.4.0,oci.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev
   - name: hadoop-external-client-docker-image
     values:
       - 3.3.6