diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index ad8668bc2..8a9118346 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -403,10 +403,10 @@ resources:
       - license_path: LICENSE
         ref: ${image_tag%-ubuntu20.04}
         url: https://github.com/NVIDIA/nvidia-container-toolkit
-  - container_image: nvcr.io/nvidia/k8s/container-toolkit:v1.15.0-ubi8
+  - container_image: ghcr.io/mesosphere/dkp-container-images/nvcr.io/nvidia/k8s/container-toolkit:v1.15.0-ubi8-d2iq.0
     sources:
       - license_path: LICENSE
-        ref: ${image_tag%-ubi8}
+        ref: ${image_tag%-ubi8-d2iq.0}
         url: https://github.com/NVIDIA/nvidia-container-toolkit
   - container_image: nvcr.io/nvidia/k8s/dcgm-exporter:3.3.5-3.4.1-ubuntu22.04
     sources:
diff --git a/services/nvidia-gpu-operator/24.3.0/defaults/cm.yaml b/services/nvidia-gpu-operator/24.3.0-d2iq.0/defaults/cm.yaml
similarity index 95%
rename from services/nvidia-gpu-operator/24.3.0/defaults/cm.yaml
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/defaults/cm.yaml
index 7b0914fb8..4988d6fc8 100644
--- a/services/nvidia-gpu-operator/24.3.0/defaults/cm.yaml
+++ b/services/nvidia-gpu-operator/24.3.0-d2iq.0/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: nvidia-gpu-operator-24.3.0-d2iq-defaults
+  name: nvidia-gpu-operator-24.3.0-d2iq.0-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
diff --git a/services/nvidia-gpu-operator/24.3.0/defaults/kustomization.yaml b/services/nvidia-gpu-operator/24.3.0-d2iq.0/defaults/kustomization.yaml
similarity index 100%
rename from services/nvidia-gpu-operator/24.3.0/defaults/kustomization.yaml
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/defaults/kustomization.yaml
diff --git a/services/nvidia-gpu-operator/24.3.0/grafana-dashboards/gpu-operator.json b/services/nvidia-gpu-operator/24.3.0-d2iq.0/grafana-dashboards/gpu-operator.json
similarity index 100%
rename from services/nvidia-gpu-operator/24.3.0/grafana-dashboards/gpu-operator.json
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/grafana-dashboards/gpu-operator.json
diff --git a/services/nvidia-gpu-operator/24.3.0/grafana-dashboards/kustomization.yaml b/services/nvidia-gpu-operator/24.3.0-d2iq.0/grafana-dashboards/kustomization.yaml
similarity index 100%
rename from services/nvidia-gpu-operator/24.3.0/grafana-dashboards/kustomization.yaml
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/grafana-dashboards/kustomization.yaml
diff --git a/services/nvidia-gpu-operator/24.3.0/helmrelease.yaml b/services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease.yaml
similarity index 91%
rename from services/nvidia-gpu-operator/24.3.0/helmrelease.yaml
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease.yaml
index c99c0a4cd..5692a60b6 100644
--- a/services/nvidia-gpu-operator/24.3.0/helmrelease.yaml
+++ b/services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease.yaml
@@ -9,7 +9,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/nvidia-gpu-operator/24.3.0/helmrelease
+  path: ./services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease
   sourceRef:
     kind: GitRepository
     name: management
diff --git a/services/nvidia-gpu-operator/24.3.0/helmrelease/extra-images.txt b/services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease/extra-images.txt
similarity index 74%
rename from services/nvidia-gpu-operator/24.3.0/helmrelease/extra-images.txt
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease/extra-images.txt
index 1881e4c40..d43fa160f 100644
--- a/services/nvidia-gpu-operator/24.3.0/helmrelease/extra-images.txt
+++ b/services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease/extra-images.txt
@@ -1,5 +1,5 @@
 nvcr.io/nvidia/k8s/container-toolkit:{{ regexReplaceAllLiteral "-.+$" .Values.toolkit.version "" }}-ubuntu20.04
-nvcr.io/nvidia/k8s/container-toolkit:{{ regexReplaceAllLiteral "-.+$" .Values.toolkit.version "" }}-ubi8
+ghcr.io/mesosphere/dkp-container-images/nvcr.io/nvidia/k8s/container-toolkit:{{ regexReplaceAllLiteral "-.+$" .Values.toolkit.version "" }}-ubi8-d2iq.0
 nvcr.io/nvidia/cloud-native/gpu-operator-validator:{{ .Values.validator.version }}
 nvcr.io/nvidia/cloud-native/dcgm:{{ .Values.dcgm.version }}
 nvcr.io/nvidia/k8s/dcgm-exporter:{{ .Values.dcgmExporter.version }}
diff --git a/services/nvidia-gpu-operator/24.3.0/helmrelease/kustomization.yaml b/services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease/kustomization.yaml
similarity index 100%
rename from services/nvidia-gpu-operator/24.3.0/helmrelease/kustomization.yaml
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease/kustomization.yaml
diff --git a/services/nvidia-gpu-operator/24.3.0/helmrelease/nvidia.yaml b/services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease/nvidia.yaml
similarity index 91%
rename from services/nvidia-gpu-operator/24.3.0/helmrelease/nvidia.yaml
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease/nvidia.yaml
index b814da3ef..dcb91b996 100644
--- a/services/nvidia-gpu-operator/24.3.0/helmrelease/nvidia.yaml
+++ b/services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease/nvidia.yaml
@@ -24,5 +24,5 @@ spec:
   releaseName: nvidia-gpu-operator
   valuesFrom:
     - kind: ConfigMap
-      name: nvidia-gpu-operator-24.3.0-d2iq-defaults
+      name: nvidia-gpu-operator-24.3.0-d2iq.0-defaults
   targetNamespace: ${releaseNamespace}
diff --git a/services/nvidia-gpu-operator/24.3.0/kustomization.yaml b/services/nvidia-gpu-operator/24.3.0-d2iq.0/kustomization.yaml
similarity index 100%
rename from services/nvidia-gpu-operator/24.3.0/kustomization.yaml
rename to services/nvidia-gpu-operator/24.3.0-d2iq.0/kustomization.yaml