diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/helm-repository.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/helm-repository.yaml
index 3bf4091a2..508056d0d 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/helm-repository.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/helm-repository.yaml
@@ -74,16 +74,8 @@ spec:
           - name: serve
             protocol: TCP
             containerPort: 5000
-        image: "{{ .Values.mindthegap.repository }}:{{ .Values.mindthegap.tag }}"
-        imagePullPolicy: "{{ .Values.mindthegap.pullPolicy }}"
-        args:
-          - serve
-          - bundle
-          - --bundle=/helm-charts/helm-charts-*.tar
-          - --listen-port=5000
-          - --listen-address=0.0.0.0
-          - --tls-private-key-file=/certs/tls.key
-          - --tls-cert-file=/certs/tls.crt
+        image: "{{ .Values.helmChartsImage.repository }}:{{ default $.Chart.AppVersion .Values.helmChartsImage.tag }}"
+        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
         volumeMounts:
         - name: certs-vol
           mountPath: "/certs"
diff --git a/charts/cluster-api-runtime-extensions-nutanix/values.yaml b/charts/cluster-api-runtime-extensions-nutanix/values.yaml
index 1dd1f7ce4..d7eb43853 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/values.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/values.yaml
@@ -137,11 +137,6 @@ helmChartsImage:
   tag: ""
   pullPolicy: IfNotPresent
 
-mindthegap:
-  repository: ghcr.io/mesosphere/mindthegap
-  tag: "v1.14.4"
-  pullPolicy: IfNotPresent
-
 # -- Optional secrets used for pulling the container image
 imagePullSecrets: []
 # - name: Secret with Registry credentials
diff --git a/hack/addons/mindthegap-helm-registry/Dockerfile b/hack/addons/mindthegap-helm-registry/Dockerfile
index 3d764b3d7..0168282aa 100644
--- a/hack/addons/mindthegap-helm-registry/Dockerfile
+++ b/hack/addons/mindthegap-helm-registry/Dockerfile
@@ -7,3 +7,12 @@ RUN --mount=source=./hack/addons/mindthegap-helm-registry/repos.yaml,target=/rep
 FROM --platform=${TARGETPLATFORM} alpine
 ARG VERSION
 COPY --from=bundle_builder /tmp/helm-charts.tar /charts/helm-charts-${VERSION}.tar
+COPY --from=bundle_builder /ko-app/mindthegap /usr/bin/mindthegap
+VOLUME /certs
+ENTRYPOINT /usr/bin/mindthegap
+CMD [ "serve", "bundle", \
+      "--bundle=/tmp/helm-charts.tar", \
+      "--listen-port=5000", \
+      "--listen-address=0.0.0.0", \
+      "--tls-private-key-file=/certs/tls.key", \
+      "--tls-cert-file=/certs/tls.crt" ]