diff --git a/packages/system/systemd/build.yaml b/packages/system/systemd/build.yaml
index 155ccbe..231c789 100644
--- a/packages/system/systemd/build.yaml
+++ b/packages/system/systemd/build.yaml
@@ -1,7 +1,28 @@
-image: opensuse/leap:15.5
-
 package_dir: /package
 
+{{if eq .Values.name "systemd-boot"}}
+image: fedora:39
+prelude:
+    - dnf install -y systemd-boot
+steps:
+  # Artifacts located at src/systemd/build/src/boot/efi/
+  # change the x64 to aa64 for arm64
+  - mkdir -p /package/usr/kairos/
+    {{ if .Values.arch }}
+    {{ if eq .Values.arch "arm64" }}
+  - cp /usr/lib/systemd/boot/efi/systemd-bootaa64.efi /package/usr/kairos/
+  - cp /usr/lib/systemd/boot/efi/linuxaa64.efi.stub /package/usr/kairos/
+  - cp /usr/lib/systemd/boot/efi/addonaa64.efi.stub /package/usr/kairos/
+    {{else}}
+  - cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi /package/usr/kairos/
+  - cp /usr/lib/systemd/boot/efi/linuxx64.efi.stub /package/usr/kairos/
+  - cp /usr/lib/systemd/boot/efi/addonx64.efi.stub /package/usr/kairos/
+    {{end}}
+{{end}}
+{{else if eq .Values.name "systemd-ukify"}}
+
+image: opensuse/leap:15.5
+
 prelude:
   - zypper ref && zypper in -y gcc13 git ninja gperf libpcap libpcap-devel libcap-devel cmake libmount-devel rsync diffutils openssl-devel tpm2-* python311-pip python311-cryptography
   - update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1
@@ -21,22 +42,6 @@ steps:
   - pip3 install meson ninja2
   - PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && cd src/systemd && env CC=gcc-13 meson setup build -Dmode=release -Dbootloader=true -Defi=true -Dukify=true -Dblkid=true -Dopenssl=true -Dshared-lib-tag=${PACKAGE_VERSION}-kairos -Dsbat-distro="Kairos" -Dsbat-distro-url="kairos.io" -Dsbat-distro-summary="Kairos" -Dsbat-distro-version="kairos-${PACKAGE_VERSION}" -Ddns-servers='' -Dsysvinit-path= -Dsysvrcnd-path= -Dtpm=false -Dinstall-tests=false -Dnss-resolve=disabled -Dlogind=false -Dcoredump=false -Dhomed=disabled -Dfirstboot=false -Dhostnamed=false -Dhibernate=false -Dinitrd=false -Dimportd=false -Dkernel-install=false -Dlocaled=false -Dmachined=false -Dnetworkd=false -Dnss-myhostname=false -Dnss-mymachines=false -Dnss-systemd=false -Doomd=false -Dportabled=false -Dhwdb=false -Dpstore=false -Dquotacheck=false -Drandomseed=false -Drepart=false -Dresolve=false -Drfkill=false -Dsysext=false -Danalyze=false -Dsysupdate=false -Dsysusers=false -Dstoragetm=false -Dtimedated=false -Dtimesyncd=false -Dtmpfiles=false -Duserdb=false -Dvconsole=false -Dxdg-autostart=false -Didn=false -Dpolkit=false -Dnscd=false -Dkmod=false -Ddbus=false -Dglib=false -Dbacklight=false -Dldconfig=false -Dgshadow=false -Dwheel-group=false -Dadm-group=false -Dxkbcommon=false -Dzstd=false -Dlz4=false -Dutmp=false -Dlink-udev-shared=false -Dlink-systemctl-shared=false -Dlink-networkd-shared=false -Dlink-timesyncd-shared=false -Dlink-journalctl-shared=false -Dlink-boot-shared=false -Dlink-portabled-shared=false -Denvironment-d=false -Dqrencode=false -Dpwquality=false -Dlibcurl=false -Dfdisk=false -Dlibidn2=false -Dlibiptc=false -Ddns-over-tls=false -Didn=false -Dgnutls=false -Dp11kit=false -Dlibidn=false -Dlibidn2=false -Dgcrypt=false -Dxz=false -Dzlib=false -Dbzip2=false
   - cd src/systemd && ninja -C build
-{{if eq .Values.name "systemd-boot"}}
-  # Artifacts located at src/systemd/build/src/boot/efi/
-  # change the x64 to aa64 for arm64
-  - mkdir -p /package/usr/kairos/
-  {{ if .Values.arch }}
-    {{ if eq .Values.arch "arm64" }}
-  - cp src/systemd/build/src/boot/efi/systemd-bootaa64.efi /package/usr/kairos/
-  - cp src/systemd/build/src/boot/efi/linuxaa64.efi.stub /package/usr/kairos/
-  - cp src/systemd/build/src/boot/efi/addonaa64.efi.stub /package/usr/kairos/
-    {{else}}
-  - cp src/systemd/build/src/boot/efi/systemd-bootx64.efi /package/usr/kairos/
-  - cp src/systemd/build/src/boot/efi/linuxx64.efi.stub /package/usr/kairos/
-  - cp src/systemd/build/src/boot/efi/addonx64.efi.stub /package/usr/kairos/
-    {{end}}
-  {{end}}
-{{else if eq .Values.name "systemd-ukify"}}
   - mkdir -p /package/usr/kairos/
   - mkdir -p /package/usr/lib/systemd/
   - mkdir -p /package/usr/lib64/systemd/
diff --git a/packages/system/systemd/collection.yaml b/packages/system/systemd/collection.yaml
index 6c4a670..49c5a04 100644
--- a/packages/system/systemd/collection.yaml
+++ b/packages/system/systemd/collection.yaml
@@ -1,7 +1,7 @@
 packages:
   - name: "systemd-boot"
     category: "system"
-    version: "255+3"
+    version: "255+4"
     labels:
       github.repo: "systemd"
       autobump.revdeps: "true"