diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index 8a9118346..daf3011f9 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -423,20 +423,20 @@ resources:
       - license_path: COPYING
         ref: ${image_tag}
         url: https://github.com/ceph/ceph
-  - container_image: quay.io/fairwinds/nova:3.4.0
+  - container_image: ghcr.io/mesosphere/dkp-container-images/quay.io/fairwinds/nova:3.4.0-d2iq.0
     sources:
       - license_path: LICENSE
-        ref: ${image_tag}
+        ref: ${image_tag%-d2iq.0}
         url: https://github.com/FairwindsOps/nova
-  - container_image: quay.io/fairwinds/pluto:v5.10.6
+  - container_image: ghcr.io/mesosphere/dkp-container-images/quay.io/fairwinds/pluto:v5.10.6-d2iq.0
     sources:
       - license_path: LICENSE
-        ref: ${image_tag}
+        ref: ${image_tag%-d2iq.0}
         url: https://github.com/FairwindsOps/pluto
-  - container_image: quay.io/fairwinds/polaris:7.0.2
+  - container_image: ghcr.io/mesosphere/dkp-container-images/quay.io/fairwinds/polaris:7.0.2-d2iq.0
     sources:
       - license_path: LICENSE
-        ref: ${image_tag}
+        ref: ${image_tag%-d2iq.0}
         url: https://github.com/FairwindsOps/polaris
   - container_image: quay.io/jetstack/cert-manager-cainjector:v1.14.7
     sources:
diff --git a/services/dkp-insights/1.1.2/defaults/cm.yaml b/services/dkp-insights/1.1.2-d2iq.0/defaults/cm.yaml
similarity index 98%
rename from services/dkp-insights/1.1.2/defaults/cm.yaml
rename to services/dkp-insights/1.1.2-d2iq.0/defaults/cm.yaml
index cdf2eceb5..b9ab761b6 100644
--- a/services/dkp-insights/1.1.2/defaults/cm.yaml
+++ b/services/dkp-insights/1.1.2-d2iq.0/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dkp-insights-1.1.2-d2iq-defaults
+  name: dkp-insights-1.1.2-d2iq.0-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
@@ -420,8 +420,8 @@ data:
       helmRepositoryURLs: []
       image:
         pullPolicy: IfNotPresent
-        repository: quay.io/fairwinds/nova
-        tag: 3.4.0
+        repository: ghcr.io/mesosphere/dkp-container-images/quay.io/fairwinds/nova
+        tag: 3.4.0-d2iq.0
       resources:
         limits:
           cpu: 100m
@@ -444,8 +444,8 @@ data:
       enabled: true
       image:
         pullPolicy: IfNotPresent
-        repository: quay.io/fairwinds/pluto
-        tag: v5.10.6
+        repository: ghcr.io/mesosphere/dkp-container-images/quay.io/fairwinds/pluto
+        tag: v5.10.6-d2iq.0
       resources:
         limits:
           cpu: 100m
@@ -499,8 +499,8 @@ data:
       enabled: true
       image:
         pullPolicy: IfNotPresent
-        repository: quay.io/fairwinds/polaris
-        tag: 7.0.2
+        repository: ghcr.io/mesosphere/dkp-container-images/quay.io/fairwinds/polaris
+        tag: 7.0.2-d2iq.0
       resources:
         limits:
           cpu: 100m
diff --git a/services/dkp-insights/1.1.2/defaults/kustomization.yaml b/services/dkp-insights/1.1.2-d2iq.0/defaults/kustomization.yaml
similarity index 100%
rename from services/dkp-insights/1.1.2/defaults/kustomization.yaml
rename to services/dkp-insights/1.1.2-d2iq.0/defaults/kustomization.yaml
diff --git a/services/dkp-insights/1.1.2/helmrelease.yaml b/services/dkp-insights/1.1.2-d2iq.0/helmrelease.yaml
similarity index 87%
rename from services/dkp-insights/1.1.2/helmrelease.yaml
rename to services/dkp-insights/1.1.2-d2iq.0/helmrelease.yaml
index 17e0fe1a0..f87db05cd 100644
--- a/services/dkp-insights/1.1.2/helmrelease.yaml
+++ b/services/dkp-insights/1.1.2-d2iq.0/helmrelease.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   force: false
   interval: 6h
-  path: ./services/dkp-insights/1.1.2/helmrelease
+  path: ./services/dkp-insights/1.1.2-d2iq.0/helmrelease
   postBuild:
     substitute:
       releaseNamespace: ${releaseNamespace}
diff --git a/services/dkp-insights/1.1.2/helmrelease/extra-images.txt b/services/dkp-insights/1.1.2-d2iq.0/helmrelease/extra-images.txt
similarity index 100%
rename from services/dkp-insights/1.1.2/helmrelease/extra-images.txt
rename to services/dkp-insights/1.1.2-d2iq.0/helmrelease/extra-images.txt
diff --git a/services/dkp-insights/1.1.2/helmrelease/helmrelease.yaml b/services/dkp-insights/1.1.2-d2iq.0/helmrelease/helmrelease.yaml
similarity index 92%
rename from services/dkp-insights/1.1.2/helmrelease/helmrelease.yaml
rename to services/dkp-insights/1.1.2-d2iq.0/helmrelease/helmrelease.yaml
index 057646b60..7332fed4e 100644
--- a/services/dkp-insights/1.1.2/helmrelease/helmrelease.yaml
+++ b/services/dkp-insights/1.1.2-d2iq.0/helmrelease/helmrelease.yaml
@@ -24,4 +24,4 @@ spec:
       strategy: uninstall
   valuesFrom:
     - kind: ConfigMap
-      name: dkp-insights-1.1.2-d2iq-defaults
+      name: dkp-insights-1.1.2-d2iq.0-defaults
diff --git a/services/dkp-insights/1.1.2/helmrelease/kustomization.yaml b/services/dkp-insights/1.1.2-d2iq.0/helmrelease/kustomization.yaml
similarity index 100%
rename from services/dkp-insights/1.1.2/helmrelease/kustomization.yaml
rename to services/dkp-insights/1.1.2-d2iq.0/helmrelease/kustomization.yaml
diff --git a/services/dkp-insights/1.1.2/helmrelease/list-images-values.yaml b/services/dkp-insights/1.1.2-d2iq.0/helmrelease/list-images-values.yaml
similarity index 100%
rename from services/dkp-insights/1.1.2/helmrelease/list-images-values.yaml
rename to services/dkp-insights/1.1.2-d2iq.0/helmrelease/list-images-values.yaml
diff --git a/services/dkp-insights/1.1.2/kustomization.yaml b/services/dkp-insights/1.1.2-d2iq.0/kustomization.yaml
similarity index 100%
rename from services/dkp-insights/1.1.2/kustomization.yaml
rename to services/dkp-insights/1.1.2-d2iq.0/kustomization.yaml