diff --git a/.github/workflows/build-ironic-images.yaml b/.github/workflows/build-ironic-images.yaml
index 0d48ba541..64a623004 100644
--- a/.github/workflows/build-ironic-images.yaml
+++ b/.github/workflows/build-ironic-images.yaml
@@ -136,7 +136,7 @@ jobs:
           make_latest: true
           fail_on_unmatched_files: true
           files: ironic-images/upload/*
-        if: ${{ github.ref == 'refs/heads/main' }}
+        if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' }}
 
   cleanup:
     runs-on: ubuntu-latest
diff --git a/ironic-images/static/etc/chrony/chrony.conf b/ironic-images/custom_elements/undercloud-ipa/static/etc/chrony/chrony.conf
similarity index 100%
rename from ironic-images/static/etc/chrony/chrony.conf
rename to ironic-images/custom_elements/undercloud-ipa/static/etc/chrony/chrony.conf
diff --git a/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/10-disable-systemd-dhcp.network b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/10-disable-systemd-dhcp.network
new file mode 100644
index 000000000..600173e29
--- /dev/null
+++ b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/10-disable-systemd-dhcp.network
@@ -0,0 +1,8 @@
+# We need to explicitly disable systemd-networkd's default of launching DHCP
+# client on all ethernet interfaces because this is already handled by the
+# dhcp-all-interfaces script that comes with IPA
+[Match]
+Name=en*
+
+[Network]
+DHCP=no
diff --git a/ironic-images/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf
similarity index 100%
rename from ironic-images/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf
rename to ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf