diff --git a/packages/alpine/build.yaml b/packages/alpine/build.yaml
new file mode 100644
index 0000000..c71d0b2
--- /dev/null
+++ b/packages/alpine/build.yaml
@@ -0,0 +1,40 @@
+{{ if eq .Values.name "alpine-rpi" }}
+  {{ if .Values.arch }}
+  {{ if eq .Values.arch "arm64" }}
+image: alpine
+# Arm + rpi
+package_dir: "/package"
+prelude:
+  - apk update
+  - apk add linux-rpi4 mkinitfs linux-firmware-none udev lvm2 findmnt rsync parted
+steps:
+  - kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
+  - mkdir -p /package/boot
+  - mkdir -p /package/lib/modules
+  - cp /boot/vmlinuz-rpi4 /package/boot/vmlinuz
+  - cp -rfv /lib/modules/* /package/lib/modules
+  # generate initramfs
+  - cp files/immucore.files /etc/mkinitfs/features.d/immucore.files
+  - kernel=$(ls /lib/modules | head -n1) && mkinitfs -o /package/boot/initrd -i files/initramfs-init -c files/mkinitfs.conf $kernel
+    {{end}}
+  {{end}}
+  {{else}}
+image: alpine
+# x86 + arm + no rpi path
+package_dir: "/package"
+prelude:
+  - apk update
+  - apk add linux-lts linux-firmware-none mkinitfs udev lvm2 findmnt rsync parted
+steps:
+  - kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
+  - mkdir -p /package/boot
+  - mkdir -p /package/lib/modules
+  # TODO: Add firmware files
+  - cp /boot/vmlinuz-lts /package/boot/vmlinuz
+  - cp -rfv /lib/modules/* /package/lib/modules
+  # generate initramfs
+  - cp files/immucore.files /etc/mkinitfs/features.d/immucore.files
+  - kernel=$(ls /lib/modules | head -n1) && mkinitfs -o /package/boot/initrd -i files/initramfs-init -c files/mkinitfs.conf $kernel
+  {{end}}
+
+
diff --git a/packages/alpine/collection.yaml b/packages/alpine/collection.yaml
new file mode 100644
index 0000000..0819c74
--- /dev/null
+++ b/packages/alpine/collection.yaml
@@ -0,0 +1,9 @@
+packages:
+  - name: "alpine"
+    category: "distro-kernel"
+    version: "0.1.2"
+    description: "Provides kernel and custom initrd for alpine"
+  - name: "alpine-rpi"
+    category: "distro-kernel"
+    version: "0.1.2"
+    description: "Provides kernel and custom initrd for alpine"
\ No newline at end of file
diff --git a/packages/initrd-alpine/files/immucore.files b/packages/alpine/files/immucore.files
similarity index 100%
rename from packages/initrd-alpine/files/immucore.files
rename to packages/alpine/files/immucore.files
diff --git a/packages/initrd-alpine/files/initramfs-init b/packages/alpine/files/initramfs-init
similarity index 100%
rename from packages/initrd-alpine/files/initramfs-init
rename to packages/alpine/files/initramfs-init
diff --git a/packages/initrd-alpine/files/mkinitfs.conf b/packages/alpine/files/mkinitfs.conf
similarity index 100%
rename from packages/initrd-alpine/files/mkinitfs.conf
rename to packages/alpine/files/mkinitfs.conf
diff --git a/packages/initrd-alpine/build.yaml b/packages/initrd-alpine/build.yaml
deleted file mode 100644
index 8930cdb..0000000
--- a/packages/initrd-alpine/build.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-{{ if eq .Values.name "alpine-rpi" }}
-  {{ if .Values.arch }}
-  {{ if eq .Values.arch "arm64" }}
-image: alpine
-
-copy:
-  - package:
-      category: "system"
-      name: "immucore"
-      version: ">=0"
-    source: "/usr/bin/immucore"
-    destination: "/usr/bin/immucore"
-  - package:
-      category: "system"
-      name: "kairos-agent"
-      version: ">=0"
-    source: "/usr/bin/kairos-agent"
-    destination: "/usr/bin/kairos-agent"
-
-# Arm + rpi
-prelude:
-  - apk update
-  - apk add linux-rpi4 mkinitfs linux-firmware-none udev lvm2 findmnt rsync parted
-  - rm /boot/initramfs-rpi4 || true
-steps:
-  - /usr/bin/immucore version
-  - cp files/immucore.files /etc/mkinitfs/features.d/immucore.files
-  - kernel=$(ls /lib/modules | head -n1) && mkinitfs -o /boot/initrd -i files/initramfs-init -c files/mkinitfs.conf $kernel
-include:
-  - ^/boot/initrd$
-    {{end}}
-  {{end}}
-{{else}}
-image: alpine
-
-copy:
-  - package:
-      category: "system"
-      name: "immucore"
-      version: ">=0"
-    source: "/usr/bin/immucore"
-    destination: "/usr/bin/immucore"
-  - package:
-      category: "system"
-      name: "kairos-agent"
-      version: ">=0"
-    source: "/usr/bin/kairos-agent"
-    destination: "/usr/bin/kairos-agent"
-# x86 + arm + no rpi path
-prelude:
-  - apk update
-  - apk add linux-lts mkinitfs linux-firmware-none udev lvm2 findmnt rsync parted
-  - rm /boot/initramfs-lts || true
-steps:
-  - /usr/bin/immucore version
-  - cp files/immucore.files /etc/mkinitfs/features.d/immucore.files
-  - kernel=$(ls /lib/modules | head -n1) && mkinitfs -o /boot/initrd -i files/initramfs-init -c files/mkinitfs.conf $kernel
-include:
-  - ^/boot/initrd$
-{{end}}
-
-
diff --git a/packages/initrd-alpine/collection.yaml b/packages/initrd-alpine/collection.yaml
deleted file mode 100644
index 46f6784..0000000
--- a/packages/initrd-alpine/collection.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-packages:
-  - name: "alpine"
-    category: "distro-initrd"
-    version: "0.1.2"
-  - name: "alpine-rpi"
-    category: "distro-initrd"
-    version: "0.1.2"