diff --git a/.github/workflows/free-disk-space/action.yml b/.github/workflows/free-disk-space/action.yml
deleted file mode 100644
index 55c129993..000000000
--- a/.github/workflows/free-disk-space/action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Free Disk Space'
-description: 'Remove content of the provided image to free disk space for the build'
-runs:
-  using: "composite"
-  steps:
-      - name:  Free disk space
-        run: |
-          sudo apt-get purge 'dotnet*' google-chrome-stable 'temurin*' google-cloud-cli azure-cli 'mongodb*' powershell firefox chromium 'llvm*' 'libllvm*' 'mysql*' libgl1-mesa-dri apache2 'mono*' 'swift*' microsoft-edge-stable default-jre-headless 'aspnetcore*'
-          sudo rm -rf /usr/local/* /opt/hostedtoolcache /opt/pipx* /opt/az
-        shell: bash
-      - name: Show disk space usage
-        run:  df -h
-        shell: bash
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 58262cee6..37442f845 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -65,8 +65,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Free Disk Space
-        uses: ./.github/workflows/free-disk-space
       - name: Build image
         run: ./kas-container build kas-iot2050-example.yml
       - name: Upload image
@@ -84,8 +82,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Free Disk Space
-        uses: ./.github/workflows/free-disk-space
       - name: Build image
         run: ./kas-container build kas-iot2050-example.yml:kas-iot2050-qemu.yml
 
@@ -96,8 +92,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Free Disk Space
-        uses: ./.github/workflows/free-disk-space
       - name: Mock EIO binary stubs
         run: |
           touch ./meta-sm/recipes-app/iot2050-eiofsd/files/bin/iot2050-eiofsd
@@ -120,8 +114,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Free Disk Space
-        uses: ./.github/workflows/free-disk-space
       - name: Mock EIO binary stubs
         run: |
           touch ./meta-sm/recipes-app/iot2050-eiofsd/files/bin/iot2050-eiofsd
@@ -137,8 +129,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Free Disk Space
-        uses: ./.github/workflows/free-disk-space
       - name: Build bootloader image
         run: ./kas-container build kas-iot2050-boot.yml
       - name: Archive bootloaders
diff --git a/meta-example/recipes-core/images/iot2050-image-example.bb b/meta-example/recipes-core/images/iot2050-image-example.bb
index 22d82815a..b1a1cfd6f 100644
--- a/meta-example/recipes-core/images/iot2050-image-example.bb
+++ b/meta-example/recipes-core/images/iot2050-image-example.bb
@@ -15,7 +15,7 @@ DESCRIPTION = "IOT2050 Debian Example Image"
 
 WKS_FILE = "iot2050-example.wks.in"
 
-INITRAMFS_RECIPE = "iot2050-initramfs-example"
+INITRAMFS_RECIPE ?= "iot2050-initramfs-example"
 
 IMAGE_INITRD = "${INITRAMFS_RECIPE}"
 do_image_wic[depends] += "${INITRAMFS_RECIPE}:do_build"
diff --git a/meta-example/recipes-core/images/iot2050-image-swu-example.bb b/meta-example/recipes-core/images/iot2050-image-swu-example.bb
index 5c11b76d2..736251c26 100644
--- a/meta-example/recipes-core/images/iot2050-image-swu-example.bb
+++ b/meta-example/recipes-core/images/iot2050-image-swu-example.bb
@@ -8,6 +8,8 @@
 # COPYING.MIT file in the top-level directory.
 #
 
+INITRAMFS_RECIPE ?= "iot2050-initramfs"
+
 require recipes-core/images/iot2050-image-example.bb
 require recipes-core/images/swupdate.inc
 
@@ -26,7 +28,6 @@ SWU_HW_COMPAT = "IOT2050"
 
 ABROOTFS_IMAGE_RECIPE ?= "iot2050-image-swu-example"
 VERITY_IMAGE_RECIPE ?= "iot2050-image-swu-example"
-INITRAMFS_RECIPE ?= "iot2050-initramfs"
 ABROOTFS_PART_UUID_A ?= "fedcba98-7654-3210-cafe-5e0710000001"
 ABROOTFS_PART_UUID_B ?= "fedcba98-7654-3210-cafe-5e0710000002"
 
diff --git a/meta-sm/recipes-app/iot2050-eiofsd/iot2050-eiofsd_1.0.0.bb b/meta-sm/recipes-app/iot2050-eiofsd/iot2050-eiofsd_1.0.0.bb
index f0b5bd81c..a8f710402 100644
--- a/meta-sm/recipes-app/iot2050-eiofsd/iot2050-eiofsd_1.0.0.bb
+++ b/meta-sm/recipes-app/iot2050-eiofsd/iot2050-eiofsd_1.0.0.bb
@@ -64,7 +64,7 @@ python () {
             See meta-sm/recipes-app/iot2050-eiofsd/files/bin/README.md for details.
             *******************************************************************
             """)
-        bb.warn(warning_message)
+        bb.warnonce(warning_message)
 
     d.setVar('SRC_URI', d.getVar('SRC_URI') + ' ' + ' '.join(uris_to_keep))
 }