diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index 6803c3bff4..4c4de60a62 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -7,71 +7,26 @@ ignore:
   - docker.io/library/busybox:1
   - gcr.io/kubecost1/cost-model:prod-1.104.0
   - gcr.io/kubecost1/frontend:prod-1.104.0
-
-  # Fossa doesn't support scanning arbitrary C-files
   - docker.io/mesosphere/pause-busybox:3.6
   - docker.io/bitnami/bitnami-shell:11-debian-11-r106
   - docker.io/bitnami/postgres-exporter:0.12.0-debian-11-r77
   - docker.io/mesosphere/trivy-bundles:0.42.1-20230809T060346Z
   - gcr.io/google_containers/pause:3.2
-
-  # Fossa cannot scan and parse gemfile provided by the fluend project
-  # - container_image: ghcr.io/banzaicloud/fluentd:v1.14.6-alpine-5
-  #   sources:
-  #     - url: https://github.com/fluent/fluentd
-  #       ref: ${image_tag%-alpine-5}
-  #       license_path: LICENSE
   - ghcr.io/banzaicloud/fluentd:v1.14.6-alpine-5
-
-  # Fossa cannot scan C/CPP projects
-  # See: https://docs.fossa.com/docs/c-cpp
-  # - container_image: nvcr.io/nvidia/cloud-native/dcgm:${image_tag}
-  #   sources:
-  #     - url: https://github.com/NVIDIA/DCGM
-  #       ref: ${image_tag}
-  #       license_path: LICENSE
   - nvcr.io/nvidia/cloud-native/dcgm:3.1.7-1-ubuntu20.04
-
-  # Incorrect mapping was provided
-  # - container_image: docker.io/bitnami/kubectl:1.19.7
-  #   sources:
-  #     - url: https://github.com/bitnami/bitnami-docker-kubectl
-  #       ref: ${image_tag}-debian-10-r31
-  #       license_path: LICENSE
   - docker.io/bitnami/kubectl:1.19.7
   - docker.io/bitnami/kubectl:1.22.0
   - docker.io/bitnami/kubectl:1.24.1
   - docker.io/bitnami/kubectl:1.26.4
-
-  # Fossa cannot scan C/CPP projects
-  # See: https://docs.fossa.com/docs/c-cpp
-  # - container_image: docker.io/curlimages/curl:7.83.1
-  #   sources:
-  #     - url: https://github.com/curl/curl
-  #       ref: curl-${image_tag//./_}
-  #       license_path: COPYING
   - docker.io/curlimages/curl:7.83.1
-
-  # This is added as part of `kubetunnel` project, but we only use cURL from
-  # this project.
-  # See: https://github.com/mesosphere/kubetunnel/blob/v0.0.15/pkg/controllers/constants.go
   - docker.io/library/centos:8
-
-  # This container is part of nvidia extension but the source code of this
-  # repo cannot be scanned by Fossa.
-  # - container_image: nvcr.io/nvidia/k8s/cuda-sample:vectoradd-cuda10.2
-  #   sources:
-  #     - url: https://github.com/NVIDIA/cuda-samples
-  #       ref: v${image_tag#vectoradd-cuda}
-  #       license_path: LICENSE
   - nvcr.io/nvidia/k8s/cuda-sample:vectoradd-cuda10.2
-
 resources:
   - container_image: cr.fluentbit.io/fluent/fluent-bit:2.1.4
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/fluent/fluent-bit
         ref: v${image_tag}
-        url: https://github.com/fluent/fluent-bit
+        license_path: LICENSE
   - container_image: docker.io/aquasec/kube-bench:v0.6.10
     sources:
       - url: https://github.com/aquasecurity/kube-bench
@@ -79,538 +34,538 @@ resources:
         license_path: LICENSE
   - container_image: docker.io/bitnami/thanos:0.31.0-scratch-r12
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/thanos-io/thanos
         ref: v${image_tag%-scratch-r12}
-        url: https://github.com/thanos-io/thanos
+        license_path: LICENSE
   - container_image: docker.io/fluent/fluent-bit:2.1.4
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/fluent/fluent-bit
         ref: v${image_tag}
-        url: https://github.com/fluent/fluent-bit
-  - container_image: docker.io/gitea/gitea:1.19.2-rootless
+        license_path: LICENSE
+  - container_image: docker.io/gitea/gitea:1.20.3-rootless
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/go-gitea/gitea
         ref: v${image_tag%-rootless}
-        url: https://github.com/go-gitea/gitea
+        license_path: LICENSE
   - container_image: docker.io/grafana/grafana:9.4.7
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE.md
+      - url: https://github.com/grafana/grafana
         ref: v${image_tag}
-        url: https://github.com/grafana/grafana
+        license_path: LICENSE
+        notice_path: NOTICE.md
   - container_image: docker.io/grafana/grafana:9.5.3
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE.md
+      - url: https://github.com/grafana/grafana
         ref: v${image_tag}
-        url: https://github.com/grafana/grafana
+        license_path: LICENSE
+        notice_path: NOTICE.md
   - container_image: docker.io/grafana/grafana:9.5.7
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE.md
+      - url: https://github.com/grafana/grafana
         ref: v${image_tag}
-        url: https://github.com/grafana/grafana
+        license_path: LICENSE
+        notice_path: NOTICE.md
   - container_image: docker.io/grafana/loki:2.8.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/grafana/loki
         ref: v${image_tag}
-        url: https://github.com/grafana/loki
+        license_path: LICENSE
   - container_image: docker.io/istio/install-cni:1.17.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/istio/istio
         ref: ${image_tag}
-        url: https://github.com/istio/istio
+        license_path: LICENSE
   - container_image: docker.io/istio/operator:1.17.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/istio/istio
         ref: ${image_tag}
-        url: https://github.com/istio/istio
+        license_path: LICENSE
   - container_image: docker.io/istio/pilot:1.17.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/istio/istio
         ref: ${image_tag}
-        url: https://github.com/istio/istio
+        license_path: LICENSE
   - container_image: docker.io/istio/proxyv2:1.17.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/istio/proxy
         ref: ${image_tag}
-        url: https://github.com/istio/proxy
+        license_path: LICENSE
   - container_image: docker.io/jaegertracing/all-in-one:1.46.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/jaegertracing/jaeger
         ref: v${image_tag}
-        url: https://github.com/jaegertracing/jaeger
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: docker.io/jaegertracing/jaeger-operator:1.46.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/jaegertracing/jaeger-operator
         ref: v${image_tag}
-        url: https://github.com/jaegertracing/jaeger-operator
+        license_path: LICENSE
   - container_image: docker.io/jimmidyson/configmap-reload:v0.7.1
     sources:
-      - license_path: LICENSE.txt
+      - url: https://github.com/jimmidyson/configmap-reload
         ref: ${image_tag}
-        url: https://github.com/jimmidyson/configmap-reload
+        license_path: LICENSE.txt
   - container_image: docker.io/kiwigrid/k8s-sidecar:1.23.1
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kiwigrid/k8s-sidecar
         ref: ${image_tag}
-        url: https://github.com/kiwigrid/k8s-sidecar
+        license_path: LICENSE
   - container_image: docker.io/kubernetesui/dashboard:v2.7.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kubernetes/dashboard
         ref: ${image_tag}
-        url: https://github.com/kubernetes/dashboard
+        license_path: LICENSE
   - container_image: docker.io/kubernetesui/metrics-scraper:v1.0.9
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kubernetes-sigs/dashboard-metrics-scraper
         ref: ${image_tag}
-        url: https://github.com/kubernetes-sigs/dashboard-metrics-scraper
+        license_path: LICENSE
   - container_image: docker.io/library/traefik:v2.10.4
     sources:
-      - license_path: LICENSE.md
+      - url: https://github.com/traefik/traefik
         ref: ${image_tag}
-        url: https://github.com/traefik/traefik
+        license_path: LICENSE.md
   - container_image: docker.io/mesosphere/capimate:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/konvoy2
+      - url: https://github.com/mesosphere/konvoy2
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/capimate:v2.3.0
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/konvoy2
+      - url: https://github.com/mesosphere/konvoy2
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/chisel:1.7.6
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/jpillora/chisel
         ref: v${image_tag}
-        url: https://github.com/jpillora/chisel
+        license_path: LICENSE
   - container_image: docker.io/mesosphere/cluster-observer:1.1.2
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander-auditing-pipeline
+      - url: https://github.com/mesosphere/kommander-auditing-pipeline
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/dex-controller:v0.8.3
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/dex-controller
+      - url: https://github.com/mesosphere/dex-controller
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/dex-k8s-authenticator:v1.2.4-d2iq
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/mesosphere/dex-k8s-authenticator
         ref: ${image_tag}
-        url: https://github.com/mesosphere/dex-k8s-authenticator
+        license_path: LICENSE
   - container_image: docker.io/mesosphere/dex:v2.35.1-d2iq.1
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/mesosphere/dex
         ref: ${image_tag}
-        url: https://github.com/mesosphere/dex
+        license_path: LICENSE
   - container_image: docker.io/mesosphere/ghostunnel:v1.7.1-server-backend-proxy
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/ghostunnel/ghostunnel
         ref: ${image_tag%-server-backend-proxy}
-        url: https://github.com/ghostunnel/ghostunnel
+        license_path: LICENSE
   - container_image: docker.io/mesosphere/insights-management:v0.6.0-dev.3
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/dkp-insights
+      - url: https://github.com/mesosphere/dkp-insights
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/insights:v0.6.0-dev.3
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/dkp-insights
+      - url: https://github.com/mesosphere/dkp-insights
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/karma:v0.88-d2iq-server-name
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/prymitive/karma
         ref: ${image_tag%-d2iq-server-name}
-        url: https://github.com/prymitive/karma
+        license_path: LICENSE
   - container_image: docker.io/mesosphere/kommander2-appmanagement-config-api:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-appmanagement-webhook:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-appmanagement:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-core-installer:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-federation-authorizedlister:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-federation-controller-manager:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-federation-webhook:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-flux-operator:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-licensing-controller-manager:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander2-licensing-webhook:${kommander}
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kommander
+      - url: https://github.com/mesosphere/kommander
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kommander:${kommander_ui}
     sources:
-      - ref: v${image_tag}
-        url: https://github.com/mesosphere/kommander-ui
+      - url: https://github.com/mesosphere/kommander-ui
+        ref: v${image_tag}
   - container_image: docker.io/mesosphere/kubeaddons-addon-initializer:v0.5.5
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kubeaddons-extrasteps
+      - url: https://github.com/mesosphere/kubeaddons-extrasteps
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kubeaddons-addon-initializer:v0.7.0
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kubeaddons-extrasteps
+      - url: https://github.com/mesosphere/kubeaddons-extrasteps
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kubetunnel-controller:v0.0.27
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kubetunnel
+      - url: https://github.com/mesosphere/kubetunnel
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kubetunnel-kubeconfig-webhook:v0.0.27
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kubetunnel
+      - url: https://github.com/mesosphere/kubetunnel
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kubetunnel-reverse-proxy:v0.0.27
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kubetunnel
+      - url: https://github.com/mesosphere/kubetunnel
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/kubetunnel-webhook:v0.0.27
     sources:
-      - ref: ${image_tag}
-        url: https://github.com/mesosphere/kubetunnel
+      - url: https://github.com/mesosphere/kubetunnel
+        ref: ${image_tag}
   - container_image: docker.io/mesosphere/traefik-forward-auth:3.1.0
     sources:
-      - license_path: LICENSE.thomseddon.md
+      - url: https://github.com/mesosphere/traefik-forward-auth
         ref: v${image_tag}
-        url: https://github.com/mesosphere/traefik-forward-auth
+        license_path: LICENSE.thomseddon.md
   - container_image: docker.io/openpolicyagent/gatekeeper-crds:v3.12.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/open-policy-agent/gatekeeper
         ref: ${image_tag}
-        url: https://github.com/open-policy-agent/gatekeeper
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: docker.io/openpolicyagent/gatekeeper:v3.12.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/open-policy-agent/gatekeeper
         ref: ${image_tag}
-        url: https://github.com/open-policy-agent/gatekeeper
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: docker.io/rook/ceph:v1.12.1
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/rook/rook
         ref: ${image_tag}
-        url: https://github.com/rook/rook
+        license_path: LICENSE
   - container_image: docker.io/thanosio/thanos:v0.15.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/thanos-io/thanos
         ref: ${image_tag}
-        url: https://github.com/thanos-io/thanos
+        license_path: LICENSE
   - container_image: docker.io/thanosio/thanos:v0.29.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/thanos-io/thanos
         ref: ${image_tag}
-        url: https://github.com/thanos-io/thanos
+        license_path: LICENSE
   - container_image: docker.io/velero/velero-plugin-for-aws:v1.7.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/vmware-tanzu/velero-plugin-for-aws
         ref: ${image_tag}
-        url: https://github.com/vmware-tanzu/velero-plugin-for-aws
+        license_path: LICENSE
   - container_image: docker.io/velero/velero:v1.11.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/vmware-tanzu/velero
         ref: ${image_tag}
-        url: https://github.com/vmware-tanzu/velero
+        license_path: LICENSE
   - container_image: gcr.io/google_containers/kubernetes-dashboard-init-amd64:v1.0.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kubernetes/dashboard
         ref: ${image_tag}
-        url: https://github.com/kubernetes/dashboard
+        license_path: LICENSE
   - container_image: gcr.io/knative-releases/knative.dev/net-istio/cmd/controller:v1.10.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/knative-sandbox/net-istio
         ref: knative-v1.10.0
-        url: https://github.com/knative-sandbox/net-istio
+        license_path: LICENSE
   - container_image: gcr.io/knative-releases/knative.dev/net-istio/cmd/webhook:v1.10.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/knative-sandbox/net-istio
         ref: knative-v1.10.0
-        url: https://github.com/knative-sandbox/net-istio
+        license_path: LICENSE
   - container_image: gcr.io/knative-releases/knative.dev/serving/cmd/activator:v1.10.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/knative/serving
         ref: knative-v1.10.0
-        url: https://github.com/knative/serving
+        license_path: LICENSE
   - container_image: gcr.io/knative-releases/knative.dev/serving/cmd/autoscaler-hpa:v1.10.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/knative/serving
         ref: knative-v1.10.0
-        url: https://github.com/knative/serving
+        license_path: LICENSE
   - container_image: gcr.io/knative-releases/knative.dev/serving/cmd/autoscaler:v1.10.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/knative/serving
         ref: knative-v1.10.0
-        url: https://github.com/knative/serving
+        license_path: LICENSE
   - container_image: gcr.io/knative-releases/knative.dev/serving/cmd/domain-mapping-webhook:v1.10.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/knative/serving
         ref: knative-v1.10.0
-        url: https://github.com/knative/serving
+        license_path: LICENSE
   - container_image: gcr.io/knative-releases/knative.dev/serving/cmd/domain-mapping:v1.10.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/knative/serving
         ref: knative-v1.10.0
-        url: https://github.com/knative/serving
+        license_path: LICENSE
   - container_image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/brancz/kube-rbac-proxy
         ref: ${image_tag}
-        url: https://github.com/brancz/kube-rbac-proxy
+        license_path: LICENSE
   - container_image: ghcr.io/fluxcd/helm-controller:v0.31.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/fluxcd/helm-controller
         ref: ${image_tag}
-        url: https://github.com/fluxcd/helm-controller
+        license_path: LICENSE
   - container_image: ghcr.io/fluxcd/kustomize-controller:v0.35.1
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/fluxcd/kustomize-controller
         ref: ${image_tag}
-        url: https://github.com/fluxcd/kustomize-controller
+        license_path: LICENSE
   - container_image: ghcr.io/fluxcd/notification-controller:v0.33.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/fluxcd/notification-controller
         ref: ${image_tag}
-        url: https://github.com/fluxcd/notification-controller
+        license_path: LICENSE
   - container_image: ghcr.io/fluxcd/source-controller:v0.36.1
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/fluxcd/source-controller
         ref: ${image_tag}
-        url: https://github.com/fluxcd/source-controller
+        license_path: LICENSE
   - container_image: ghcr.io/helm/chartmuseum:v0.16.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/helm/chartmuseum
         ref: ${image_tag}
-        url: https://github.com/helm/chartmuseum
+        license_path: LICENSE
   - container_image: ghcr.io/kube-logging/config-reloader:v0.0.5
     sources:
-      - license_path: LICENSE.txt
+      - url: https://github.com/kube-logging/config-reloader
         ref: ${image_tag}
-        url: https://github.com/kube-logging/config-reloader
+        license_path: LICENSE.txt
   - container_image: ghcr.io/kube-logging/logging-operator:4.2.2
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/kube-logging/logging-operator
         ref: ${image_tag}
-        url: https://github.com/kube-logging/logging-operator
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: ghcr.io/kube-logging/node-exporter:v0.6.1
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kube-logging/node-exporter-image
         ref: ${image_tag}
-        url: https://github.com/kube-logging/node-exporter-image
+        license_path: LICENSE
   - container_image: ghcr.io/mesosphere/kubefed:v0.10.3
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/mesosphere/kubefed
         ref: ${image_tag}
-        url: https://github.com/mesosphere/kubefed
+        license_path: LICENSE
   - container_image: ghcr.io/stakater/reloader:v1.0.33
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/stakater/Reloader
         ref: ${image_tag}
-        url: https://github.com/stakater/Reloader
+        license_path: LICENSE
   - container_image: nvcr.io/nvidia/cloud-native/gpu-operator-validator:v23.3.2
     sources:
-      - license_path: validator/LICENSE
+      - url: https://github.com/NVIDIA/gpu-operator
         ref: ${image_tag}
-        url: https://github.com/NVIDIA/gpu-operator
+        license_path: validator/LICENSE
   - container_image: nvcr.io/nvidia/gpu-feature-discovery:v0.8.0-ubi8
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/NVIDIA/gpu-feature-discovery
         ref: ${image_tag%-ubi8}
-        url: https://github.com/NVIDIA/gpu-feature-discovery
+        license_path: LICENSE
   - container_image: nvcr.io/nvidia/gpu-operator:v23.3.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/NVIDIA/gpu-operator
         ref: ${image_tag}
-        url: https://github.com/NVIDIA/gpu-operator
+        license_path: LICENSE
   - container_image: nvcr.io/nvidia/k8s-device-plugin:v0.14.0-ubi8
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/NVIDIA/k8s-device-plugin
         ref: ${image_tag%-ubi8}
-        url: https://github.com/NVIDIA/k8s-device-plugin
+        license_path: LICENSE
   - container_image: nvcr.io/nvidia/k8s/container-toolkit:v1.13.1-centos7
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/NVIDIA/nvidia-container-toolkit
         ref: ${image_tag%-centos7}
-        url: https://github.com/NVIDIA/nvidia-container-toolkit
+        license_path: LICENSE
   - container_image: nvcr.io/nvidia/k8s/container-toolkit:v1.13.1-ubi8
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/NVIDIA/nvidia-container-toolkit
         ref: ${image_tag%-ubi8}
-        url: https://github.com/NVIDIA/nvidia-container-toolkit
+        license_path: LICENSE
   - container_image: nvcr.io/nvidia/k8s/container-toolkit:v1.13.1-ubuntu20.04
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/NVIDIA/nvidia-container-toolkit
         ref: ${image_tag%-ubuntu20.04}
-        url: https://github.com/NVIDIA/nvidia-container-toolkit
+        license_path: LICENSE
   - container_image: nvcr.io/nvidia/k8s/dcgm-exporter:3.1.7-3.1.4-ubuntu20.04
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/NVIDIA/dcgm-exporter
         ref: ${image_tag%-ubuntu20.04}
-        url: https://github.com/NVIDIA/dcgm-exporter
+        license_path: LICENSE
   - container_image: quay.io/brancz/kube-rbac-proxy:v0.14.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/brancz/kube-rbac-proxy
         ref: ${image_tag}
-        url: https://github.com/brancz/kube-rbac-proxy
+        license_path: LICENSE
   - container_image: quay.io/ceph/ceph:v17.2.6
     sources:
-      - license_path: COPYING
+      - url: https://github.com/ceph/ceph
         ref: ${image_tag}
-        url: https://github.com/ceph/ceph
+        license_path: COPYING
   - container_image: quay.io/fairwinds/nova:3.4.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/FairwindsOps/nova
         ref: ${image_tag}
-        url: https://github.com/FairwindsOps/nova
+        license_path: LICENSE
   - container_image: quay.io/fairwinds/pluto:v5.10.6
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/FairwindsOps/pluto
         ref: ${image_tag}
-        url: https://github.com/FairwindsOps/pluto
+        license_path: LICENSE
   - container_image: quay.io/fairwinds/polaris:5.1
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/FairwindsOps/polaris
         ref: ${image_tag}.0
-        url: https://github.com/FairwindsOps/polaris
+        license_path: LICENSE
   - container_image: quay.io/jetstack/cert-manager-cainjector:v1.12.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/cert-manager/cert-manager
         ref: ${image_tag}
-        url: https://github.com/cert-manager/cert-manager
+        license_path: LICENSE
   - container_image: quay.io/jetstack/cert-manager-controller:v1.12.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/cert-manager/cert-manager
         ref: ${image_tag}
-        url: https://github.com/cert-manager/cert-manager
+        license_path: LICENSE
   - container_image: quay.io/jetstack/cert-manager-ctl:v1.12.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/cert-manager/cert-manager
         ref: ${image_tag}
-        url: https://github.com/cert-manager/cert-manager
+        license_path: LICENSE
   - container_image: quay.io/jetstack/cert-manager-webhook:v1.12.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/cert-manager/cert-manager
         ref: ${image_tag}
-        url: https://github.com/cert-manager/cert-manager
+        license_path: LICENSE
   - container_image: quay.io/jetstack/kube-oidc-proxy:v0.3.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/jetstack/kube-oidc-proxy
         ref: ${image_tag}
-        url: https://github.com/jetstack/kube-oidc-proxy
+        license_path: LICENSE
   - container_image: quay.io/kiali/kiali-operator:v1.70.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kiali/kiali-operator
         ref: ${image_tag}
-        url: https://github.com/kiali/kiali-operator
+        license_path: LICENSE
   - container_image: quay.io/kiali/kiali:v1.70.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kiali/kiali
         ref: ${image_tag}
-        url: https://github.com/kiali/kiali
+        license_path: LICENSE
   - container_image: quay.io/kiwigrid/k8s-sidecar:1.24.3
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kiwigrid/k8s-sidecar
         ref: ${image_tag}
-        url: https://github.com/kiwigrid/k8s-sidecar
+        license_path: LICENSE
   - container_image: quay.io/kiwigrid/k8s-sidecar:1.24.6
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kiwigrid/k8s-sidecar
         ref: ${image_tag}
-        url: https://github.com/kiwigrid/k8s-sidecar
+        license_path: LICENSE
   - container_image: quay.io/kubernetes-multicluster/kubefed:v0.9.1
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kubernetes-sigs/kubefed
         ref: ${image_tag}
-        url: https://github.com/kubernetes-sigs/kubefed
+        license_path: LICENSE
   - container_image: quay.io/kubernetes_incubator/nfs-provisioner:v2.3.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kubernetes-retired/external-storage
         ref: nfs-provisioner-${image_tag}
-        url: https://github.com/kubernetes-retired/external-storage
+        license_path: LICENSE
   - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.66.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/prometheus-operator/prometheus-operator
         ref: ${image_tag}
-        url: https://github.com/prometheus-operator/prometheus-operator
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: quay.io/prometheus-operator/prometheus-operator:v0.66.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/prometheus-operator/prometheus-operator
         ref: ${image_tag}
-        url: https://github.com/prometheus-operator/prometheus-operator
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: quay.io/prometheus/alertmanager:v0.21.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/prometheus/alertmanager
         ref: ${image_tag}
-        url: https://github.com/prometheus/alertmanager
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: quay.io/prometheus/alertmanager:v0.25.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/prometheus/alertmanager
         ref: ${image_tag}
-        url: https://github.com/prometheus/alertmanager
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: quay.io/prometheus/node-exporter:v1.6.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/prometheus/node_exporter
         ref: ${image_tag}
-        url: https://github.com/prometheus/node_exporter
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: quay.io/prometheus/prometheus:v2.35.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/prometheus/prometheus
         ref: ${image_tag}
-        url: https://github.com/prometheus/prometheus
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: quay.io/prometheus/prometheus:v2.45.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/prometheus/prometheus
         ref: ${image_tag}
-        url: https://github.com/prometheus/prometheus
+        license_path: LICENSE
+        notice_path: NOTICE
   - container_image: quay.io/thanos/thanos:v0.31.0
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/thanos-io/thanos
         ref: ${image_tag}
-        url: https://github.com/thanos-io/thanos
+        license_path: LICENSE
   - container_image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kubernetes/ingress-nginx
         ref: controller-${image_tag}
-        url: https://github.com/kubernetes/ingress-nginx
+        license_path: LICENSE
   - container_image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v1.9.8
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kubernetes/kube-state-metrics
         ref: ${image_tag}
-        url: https://github.com/kubernetes/kube-state-metrics
+        license_path: LICENSE
   - container_image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.9.2
     sources:
-      - license_path: LICENSE
+      - url: https://github.com/kubernetes/kube-state-metrics
         ref: ${image_tag}
-        url: https://github.com/kubernetes/kube-state-metrics
+        license_path: LICENSE
   - container_image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.0
     sources:
-      - license_path: LICENSE
-        notice_path: NOTICE
+      - url: https://github.com/kubernetes-sigs/prometheus-adapter
         ref: ${image_tag}
-        url: https://github.com/kubernetes-sigs/prometheus-adapter
+        license_path: LICENSE
+        notice_path: NOTICE