diff --git a/ironic/templates/bin/_ironic-api.sh.tpl b/ironic/templates/bin/_ironic-api.sh.tpl
index 0d8fde7227..04ad463844 100644
--- a/ironic/templates/bin/_ironic-api.sh.tpl
+++ b/ironic/templates/bin/_ironic-api.sh.tpl
@@ -19,9 +19,6 @@ COMMAND="${@:-start}"
 {{- if and (.Values.bootstrap.object_store.enabled) (.Values.bootstrap.object_store.openstack.enabled) }}
 OPTIONS=" --config-file /tmp/pod-shared/swift.conf"
 {{- end }}
-{{- if and (.Values.bootstrap.network.enabled) (.Values.bootstrap.network.openstack.enabled) }}
-OPTIONS="${OPTIONS} --config-file /tmp/pod-shared/cleaning-network.conf"
-{{- end }}
 
 function start () {
   exec ironic-api \
diff --git a/ironic/templates/bin/_ironic-conductor.sh.tpl b/ironic/templates/bin/_ironic-conductor.sh.tpl
index ac09fbd4e7..29bc5b3f0d 100644
--- a/ironic/templates/bin/_ironic-conductor.sh.tpl
+++ b/ironic/templates/bin/_ironic-conductor.sh.tpl
@@ -22,9 +22,6 @@ mkdir -p /var/lib/openstack-helm/ironic/master_images
 {{- if and (.Values.bootstrap.object_store.enabled) (.Values.bootstrap.object_store.openstack.enabled) }}
 OPTIONS=" --config-file /tmp/pod-shared/swift.conf"
 {{- end }}
-{{- if and (.Values.bootstrap.network.enabled) (.Values.bootstrap.network.openstack.enabled) }}
-OPTIONS="${OPTIONS} --config-file /tmp/pod-shared/cleaning-network.conf"
-{{- end }}
 
 exec ironic-conductor \
       --config-file /etc/ironic/ironic.conf \
diff --git a/ironic/templates/bin/_retreive-cleaning-network.sh.tpl b/ironic/templates/bin/_retreive-cleaning-network.sh.tpl
deleted file mode 100644
index d096995bd7..0000000000
--- a/ironic/templates/bin/_retreive-cleaning-network.sh.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-set -ex
-
-IRONIC_NEUTRON_CLEANING_NET_ID=$(openstack network show ${neutron_network_name} -f value -c id)
-tee /tmp/pod-shared/cleaning-network.conf <<EOF
-[neutron]
-cleaning_network_uuid = ${IRONIC_NEUTRON_CLEANING_NET_ID}
-EOF
diff --git a/ironic/templates/configmap-bin.yaml b/ironic/templates/configmap-bin.yaml
index 96668032b5..10933172b0 100644
--- a/ironic/templates/configmap-bin.yaml
+++ b/ironic/templates/configmap-bin.yaml
@@ -30,8 +30,6 @@ data:
 {{- end }}
   manage-cleaning-network.sh: |
 {{ tuple "bin/_manage-cleaning-network.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  retreive-cleaning-network.sh: |
-{{ tuple "bin/_retreive-cleaning-network.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   retreive-swift-config.sh: |
 {{ tuple "bin/_retreive-swift-config.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   db-drop.py: |
diff --git a/ironic/templates/configmap-etc.yaml b/ironic/templates/configmap-etc.yaml
index 8b253360cc..31f940afe2 100644
--- a/ironic/templates/configmap-etc.yaml
+++ b/ironic/templates/configmap-etc.yaml
@@ -188,8 +188,8 @@ limitations under the License.
 {{- $_ := set .Values.conf.ironic.swift "password" .Values.endpoints.identity.auth.ironic.password -}}
 {{- end -}}
 
-{{- if empty .Values.conf.ironic.conductor.api_url -}}
-{{- $_ := tuple "baremetal" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.conductor "api_url" -}}
+{{- if empty .Values.conf.ironic.neutron.cleaning_network -}}
+{{- $_ := set .Values.conf.ironic.neutron "cleaning_network" (default "" .Values.network.pxe.neutron_network_name) -}}
 {{- end -}}
 
 {{- if empty .Values.conf.ironic.api.public_endpoint -}}
@@ -220,6 +220,10 @@ limitations under the License.
 {{- $formatter_fluent := dict "class" "oslo_log.formatters.FluentFormatter" -}}
 {{- $_ := set .Values.conf.logging "formatter_fluent" $formatter_fluent -}}
 {{- end -}}
+
+{{- if empty .Values.conf.ironic.keystone_authtoken.auth_uri -}}
+{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.keystone_authtoken "auth_uri" -}}
+{{- end -}}
 ---
 apiVersion: v1
 kind: Secret
diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml
index 491ae80993..decbffeba2 100644
--- a/ironic/templates/deployment-api.yaml
+++ b/ironic/templates/deployment-api.yaml
@@ -79,27 +79,6 @@ spec:
               readOnly: true
             - name: pod-shared
               mountPath: /tmp/pod-shared
-{{- end }}
-{{- if and (.Values.bootstrap.network.enabled) (.Values.bootstrap.network.openstack.enabled) }}
-        - name: ironic-retrive-cleaning-net
-{{ tuple $envAll "ironic_retrive_cleaning_network" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          env:
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
-{{- end }}
-{{ include "helm-toolkit.utils.to_k8s_env_vars" $envAll.Values.network.pxe | indent 12 }}
-          command:
-            - /tmp/retreive-cleaning-network.sh
-          volumeMounts:
-            - name: pod-tmp
-              mountPath: /tmp
-            - name: ironic-bin
-              mountPath: /tmp/retreive-cleaning-network.sh
-              subPath: retreive-cleaning-network.sh
-              readOnly: true
-            - name: pod-shared
-              mountPath: /tmp/pod-shared
 {{- end }}
       containers:
         - name: ironic-api
diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml
index fc01c37872..76f0d5a781 100644
--- a/ironic/templates/statefulset-conductor.yaml
+++ b/ironic/templates/statefulset-conductor.yaml
@@ -142,27 +142,6 @@ spec:
               readOnly: true
             - name: pod-shared
               mountPath: /tmp/pod-shared
-{{- end }}
-{{- if and (.Values.bootstrap.network.enabled) (.Values.bootstrap.network.openstack.enabled) }}
-        - name: ironic-retrive-cleaning-net
-{{ tuple $envAll "ironic_retrive_cleaning_network" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          env:
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
-{{- end }}
-{{ include "helm-toolkit.utils.to_k8s_env_vars" $envAll.Values.network.pxe | indent 12 }}
-          command:
-            - /tmp/retreive-cleaning-network.sh
-          volumeMounts:
-            - name: pod-tmp
-              mountPath: /tmp
-            - name: ironic-bin
-              mountPath: /tmp/retreive-cleaning-network.sh
-              subPath: retreive-cleaning-network.sh
-              readOnly: true
-            - name: pod-shared
-              mountPath: /tmp/pod-shared
 {{- end }}
         {{- with .Values.conductor.initContainers }}
         {{- tpl (toYaml .) $ | nindent 8 }}
diff --git a/ironic/values.yaml b/ironic/values.yaml
index ac0d0f632b..21cf727ebd 100644
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -34,7 +34,6 @@ labels:
 images:
   tags:
     ironic_manage_cleaning_network: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
-    ironic_retrive_cleaning_network: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
     ironic_retrive_swift_config: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
     # Bootstrap image requires curl
     bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
@@ -329,10 +328,6 @@ bootstrap:
         source: tinyipa-stable-wallaby.vmlinuz
         disk_format: aki
         container_format: aki
-  network:
-    enabled: true
-    openstack:
-      enabled: true
   object_store:
     enabled: true
     openstack:
diff --git a/releasenotes/notes/ironic-2fcd7c5ae98b55f4.yaml b/releasenotes/notes/ironic-2fcd7c5ae98b55f4.yaml
new file mode 100644
index 0000000000..cc31c101cd
--- /dev/null
+++ b/releasenotes/notes/ironic-2fcd7c5ae98b55f4.yaml
@@ -0,0 +1,9 @@
+---
+ironic:
+  - |
+    Drop the retrive-cleaning-network init container as it was only setting a
+    deprecated option and the script it ran gave less feedback to the user than
+    the built in check inside of Ironic. With the future of Ironic standalone
+    networking this option will make even less sense so allow the default
+    behavior of looking up the name in Ironic.
+...