diff --git a/.github/workflows/containers.yaml b/.github/workflows/containers.yaml
index f977fd3a0..4d7c6f887 100644
--- a/.github/workflows/containers.yaml
+++ b/.github/workflows/containers.yaml
@@ -111,7 +111,7 @@ jobs:
         with:
           context: "{{defaultContext}}:containers/dnsmasq"
           file: Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
diff --git a/components/ironic/dnsmasq-ss.yaml b/components/ironic/dnsmasq-ss.yaml
index ecce8c289..538230e8f 100644
--- a/components/ironic/dnsmasq-ss.yaml
+++ b/components/ironic/dnsmasq-ss.yaml
@@ -78,9 +78,6 @@ spec:
               mountPath: /etc/dnsmasq.d
             - name: pod-dhcp
               mountPath: /var/lib/misc
-            - name: understack-data
-              mountPath: /var/lib/understack/
-              readOnly: true
       volumes:
         - name: pod-tmp
           emptyDir: {}
@@ -90,6 +87,3 @@ spec:
         - name: pod-dhcp
           persistentVolumeClaim:
             claimName: dnsmasq-dhcp
-        - name: understack-data
-          persistentVolumeClaim:
-            claimName: understack-data
diff --git a/components/ironic/kustomization.yaml b/components/ironic/kustomization.yaml
index 985655c44..892c74827 100644
--- a/components/ironic/kustomization.yaml
+++ b/components/ironic/kustomization.yaml
@@ -7,7 +7,6 @@ resources:
   - ironic-rabbitmq-queue.yaml
   - dnsmasq-pvc.yaml
   - dnsmasq-ss.yaml
-  - understack-data-pvc.yaml
   - ironic-ks-user-baremetal.yaml
   # less than ideal addition but necessary so that we can have the ironic.conf.d loading
   # working due to the way the chart hardcodes the config-file parameter which then
diff --git a/components/ironic/understack-data-pvc.yaml b/components/ironic/understack-data-pvc.yaml
deleted file mode 100644
index 9fc530f0a..000000000
--- a/components/ironic/understack-data-pvc.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: understack-data
-  namespace: openstack
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 10Gi
diff --git a/components/ironic/values.yaml b/components/ironic/values.yaml
index 2f5a61e7a..df727e96c 100644
--- a/components/ironic/values.yaml
+++ b/components/ironic/values.yaml
@@ -215,8 +215,6 @@ pod:
             mountPath: /etc/dnsmasq.d/
           - name: dnsmasq-dhcp
             mountPath: /var/lib/dnsmasq/
-          - name: understack-data
-            mountPath: /var/lib/understack
           - name: device-types
             mountPath: /var/lib/understack/device-types
           - name: ironic-etc-snippets
@@ -229,9 +227,6 @@ pod:
           - name: dnsmasq-dhcp
             persistentVolumeClaim:
               claimName: dnsmasq-dhcp
-          - name: understack-data
-            persistentVolumeClaim:
-              claimName: understack-data
           - name: device-types
             configMap:
               name: device-types
diff --git a/containers/dnsmasq/Dockerfile b/containers/dnsmasq/Dockerfile
index 714b00990..ca0242e51 100644
--- a/containers/dnsmasq/Dockerfile
+++ b/containers/dnsmasq/Dockerfile
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get -y install \
     pkg-config \
     ca-certificates \
     quilt \
+    ipxe \
     --no-install-recommends
 WORKDIR /src
 RUN apt-get -y build-dep dnsmasq
@@ -42,11 +43,14 @@ COPY --from=builder /src/dnsmasq-base_*_amd64.deb /tmp
 COPY --from=builder /src/dnsmasq_*_all.deb /tmp
 
 RUN apt-get update && \
-    apt-get -y install --no-install-recommends python3-jinja2 && \
+    apt-get -y install --no-install-recommends python3-jinja2 ipxe && \
     apt-get -y --fix-broken install --no-install-recommends /tmp/dnsmasq-base_*_amd64.deb /tmp/dnsmasq_*_all.deb && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/*.deb
 
+RUN mkdir -p /var/lib/openstack-helm/tftpboot && \
+    cp /usr/lib/ipxe/snponly.efi /var/lib/openstack-helm/tftpboot/
+
 COPY common/helpers.sh /helpers.sh
 COPY dnsmasq/entry-point.sh /entry-point.sh
 RUN chmod +x /entry-point.sh