diff --git a/packages/base-images/collection.yaml b/packages/base-images/collection.yaml
index 75fc52f..9a8c43b 100644
--- a/packages/base-images/collection.yaml
+++ b/packages/base-images/collection.yaml
@@ -69,13 +69,14 @@ packages:
 - name: "opensuse-leap"
   category: "base-image"
   pm: "zypper"
-  version: "15.4"
+  version: "15.4+1"
   image: "opensuse/leap:15.4"
   packages: >-
         bash-completion
         conntrack-tools
         coreutils
         curl
+        dhcp
         device-mapper
         dosfstools
         dracut
diff --git a/packages/initrd/build.yaml b/packages/initrd/build.yaml
index 180e39a..1793db4 100644
--- a/packages/initrd/build.yaml
+++ b/packages/initrd/build.yaml
@@ -25,20 +25,31 @@ copy:
   source: "/package/."
   destination: "/"
 {{ end }}
+#{{ if and ( ne .Values.name "ubuntu-20-lts" ) ( ne .Values.name "ubuntu" ) ( ne .Values.name "ubuntu-22-lts" ) }}
+#- package: 
+#    category: "dracut"
+#    name: "systemd-resolved"
+#    version: ">=0"
+#  source: "/package/."
+#  destination: "/"
+#{{ end }}
+
+# Use network-legacy until https://github.com/dracutdevs/dracut/issues/1822 is fixed
 {{ if and ( ne .Values.name "ubuntu-20-lts" ) ( ne .Values.name "ubuntu" ) ( ne .Values.name "ubuntu-22-lts" ) }}
 - package: 
     category: "dracut"
-    name: "systemd-resolved"
+    name: "network-legacy"
+    version: ">=0"
+  source: "/package/."
+  destination: "/"
+{{ else }}
+- package: 
+    category: "dracut"
+    name: "network-legacy-compat"
     version: ">=0"
   source: "/package/."
   destination: "/"
 {{ end }}
-- package: 
-    category: "dracut"
-    name: "network"
-    version: ">=0"
-  source: "/package/."
-  destination: "/"
 - package: 
     category: "dracut"
     name: "kcrypt"
diff --git a/packages/initrd/collection.yaml b/packages/initrd/collection.yaml
index 3738481..ca2329a 100644
--- a/packages/initrd/collection.yaml
+++ b/packages/initrd/collection.yaml
@@ -1,13 +1,13 @@
 packages:
 - name: "opensuse-leap"
   category: "distro-initrd"
-  version: "0.21"
+  version: "0.22"
 # - name: "fedora"
 #   category: "distro-initrd"
 #   version: "0.11"
 - name: "ubuntu-20-lts"
   category: "distro-initrd"
-  version: "0.21"
+  version: "0.22"
 - name: "ubuntu"
   category: "distro-initrd"
-  version: "0.21"
+  version: "0.22"
diff --git a/packages/kernels/collection.yaml b/packages/kernels/collection.yaml
index 8357c94..c146809 100644
--- a/packages/kernels/collection.yaml
+++ b/packages/kernels/collection.yaml
@@ -1,7 +1,7 @@
 packages:
 - category: "distro-kernels"
   name: "opensuse-leap"
-  version: "15.4+7"
+  version: "15.4+8"
   distribution: "opensuse"
   packages_arm: "raspberrypi-firmware-config raspberrypi-firmware-dt"
   packages: "kernel-default kernel-firmware-all"
@@ -14,13 +14,13 @@ packages:
 #   packages: "kernel grub2 kernel-core dracut dracut-live"
 - category: "distro-kernels"
   name: "ubuntu-20-lts"
-  version: "20.04+7"
+  version: "20.04+8"
   distribution: "ubuntu"
   packages: "linux-image-generic-hwe-20.04"
   packages_arm: "linux-image-raspi"
 - category: "distro-kernels"
   name: "ubuntu"
-  version: "22.10"
+  version: "22.10+8"
   distribution: "ubuntu"
   packages: "linux-image-generic-hwe-20.04"
   packages_arm: "linux-image-raspi"
\ No newline at end of file
diff --git a/packages/system/dracut/network-legacy-compat/build.yaml b/packages/system/dracut/network-legacy-compat/build.yaml
new file mode 100644
index 0000000..caee2cd
--- /dev/null
+++ b/packages/system/dracut/network-legacy-compat/build.yaml
@@ -0,0 +1,5 @@
+image: alpine
+package_dir: "/package"
+steps:
+- mkdir -p /package/etc/dracut.conf.d
+- cp -rfv conf/* /package/etc/dracut.conf.d
diff --git a/packages/system/dracut/network-legacy-compat/collection.yaml b/packages/system/dracut/network-legacy-compat/collection.yaml
new file mode 100644
index 0000000..3a24115
--- /dev/null
+++ b/packages/system/dracut/network-legacy-compat/collection.yaml
@@ -0,0 +1,4 @@
+packages:
+- name: "network-legacy-compat"
+  category: "dracut"
+  version: "0.9"
diff --git a/packages/system/dracut/network-legacy-compat/conf/90-kairos-network-legacy-compat.conf b/packages/system/dracut/network-legacy-compat/conf/90-kairos-network-legacy-compat.conf
new file mode 100644
index 0000000..328ef74
--- /dev/null
+++ b/packages/system/dracut/network-legacy-compat/conf/90-kairos-network-legacy-compat.conf
@@ -0,0 +1,2 @@
+omit_dracutmodules+=" systemd-networkd "
+add_dracutmodules+=" network "
\ No newline at end of file
diff --git a/packages/system/dracut/network-legacy/build.yaml b/packages/system/dracut/network-legacy/build.yaml
new file mode 100644
index 0000000..caee2cd
--- /dev/null
+++ b/packages/system/dracut/network-legacy/build.yaml
@@ -0,0 +1,5 @@
+image: alpine
+package_dir: "/package"
+steps:
+- mkdir -p /package/etc/dracut.conf.d
+- cp -rfv conf/* /package/etc/dracut.conf.d
diff --git a/packages/system/dracut/network-legacy/collection.yaml b/packages/system/dracut/network-legacy/collection.yaml
new file mode 100644
index 0000000..f46123d
--- /dev/null
+++ b/packages/system/dracut/network-legacy/collection.yaml
@@ -0,0 +1,4 @@
+packages:
+- name: "network-legacy"
+  category: "dracut"
+  version: "0.9"
diff --git a/packages/system/dracut/network-legacy/conf/90-kairos-network-legacy.conf b/packages/system/dracut/network-legacy/conf/90-kairos-network-legacy.conf
new file mode 100644
index 0000000..d99578b
--- /dev/null
+++ b/packages/system/dracut/network-legacy/conf/90-kairos-network-legacy.conf
@@ -0,0 +1,2 @@
+omit_dracutmodules+=" systemd-networkd "
+add_dracutmodules+=" network-legacy "
\ No newline at end of file
diff --git a/packages/system/dracut/network/build.yaml b/packages/system/dracut/network/build.yaml
index 8d839e9..a04f31e 100644
--- a/packages/system/dracut/network/build.yaml
+++ b/packages/system/dracut/network/build.yaml
@@ -1,7 +1,5 @@
 image: alpine
-package_dir: "/package"
+package_dir: "/{{.Values.category}}{{.Values.name}}"
 steps:
-- mkdir -p /package/etc/systemd/network
-- mkdir -p /package/etc/dracut.conf.d
-- cp -rfv conf/* /package/etc/dracut.conf.d
-- cp -rfv network/* /package/etc/systemd/network
+- mkdir -p /{{.Values.category}}{{.Values.name}}/etc/dracut.conf.d
+- cp -rfv conf/* /{{.Values.category}}{{.Values.name}}/etc/dracut.conf.d
diff --git a/packages/system/dracut/network/conf/90-kairos-network.conf b/packages/system/dracut/network/conf/90-kairos-network.conf
index 09fafe1..e940eac 100644
--- a/packages/system/dracut/network/conf/90-kairos-network.conf
+++ b/packages/system/dracut/network/conf/90-kairos-network.conf
@@ -1,2 +1,2 @@
-install_items+=" /etc/systemd/network/20-dhcp.network /etc/systemd/network/21-dhcp-legacy.network "
+install_items+=" /etc/systemd/network/20-dhcp.network "
 add_dracutmodules+=" systemd-networkd "
diff --git a/packages/system/dracut/network/definition.yaml b/packages/system/dracut/network/definition.yaml
index 4f5a6c0..5350755 100644
--- a/packages/system/dracut/network/definition.yaml
+++ b/packages/system/dracut/network/definition.yaml
@@ -1,3 +1,8 @@
 name: "network"
 category: "dracut"
-version: "0.11"
\ No newline at end of file
+version: "0.12"
+# System files shipped separately as consumed by both dracut and user-space
+requires:
+- name: "network"
+  category: "systemd-default"
+  version: ">=0"
\ No newline at end of file
diff --git a/packages/system/dracut/network/network/21-dhcp-legacy.network b/packages/system/dracut/network/network/21-dhcp-legacy.network
deleted file mode 100644
index cba38ab..0000000
--- a/packages/system/dracut/network/network/21-dhcp-legacy.network
+++ /dev/null
@@ -1,4 +0,0 @@
-[Match]
-Name=eth*
-[Network]
-DHCP=yes
\ No newline at end of file
diff --git a/packages/system/elemental/build.yaml b/packages/system/elemental/build.yaml
index e197ece..1cb23d9 100644
--- a/packages/system/elemental/build.yaml
+++ b/packages/system/elemental/build.yaml
@@ -15,7 +15,7 @@ prelude:
 
 steps:
   - |
-    cd $REPO && make build && \
+    cd $REPO && make GIT_TAG={{.Values.version}}+kairos build && \
     mv bin/{{.Values.bin_name}} /usr/bin/{{.Values.bin_name}}
 
 includes:
diff --git a/packages/system/init-svc/systemd-defaults/network/build.yaml b/packages/system/init-svc/systemd-defaults/network/build.yaml
new file mode 100644
index 0000000..ad9ff6c
--- /dev/null
+++ b/packages/system/init-svc/systemd-defaults/network/build.yaml
@@ -0,0 +1,5 @@
+image: alpine
+package_dir: "/package"
+steps:
+- mkdir -p /package/etc/systemd/network
+- cp -rfv network/* /package/etc/systemd/network
diff --git a/packages/system/init-svc/systemd-defaults/network/definition.yaml b/packages/system/init-svc/systemd-defaults/network/definition.yaml
new file mode 100644
index 0000000..d867953
--- /dev/null
+++ b/packages/system/init-svc/systemd-defaults/network/definition.yaml
@@ -0,0 +1,3 @@
+name: "network"
+category: "systemd-default"
+version: "0.11"
\ No newline at end of file
diff --git a/packages/system/dracut/network/network/20-dhcp.network b/packages/system/init-svc/systemd-defaults/network/network/20-dhcp.network
similarity index 74%
rename from packages/system/dracut/network/network/20-dhcp.network
rename to packages/system/init-svc/systemd-defaults/network/network/20-dhcp.network
index d4d203a..dbbb2c8 100644
--- a/packages/system/dracut/network/network/20-dhcp.network
+++ b/packages/system/init-svc/systemd-defaults/network/network/20-dhcp.network
@@ -1,4 +1,4 @@
 [Match]
-Name=en*
+Name=*
 [Network]
 DHCP=yes
\ No newline at end of file