diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a5f8e3..4f6bc32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ stages:
 build-image:
   stage: build
   interruptible: true
-  image: ghcr.io/blue-build/cli:ci-driver
+  image: ghcr.io/blue-build/cli:finish-signing-driver
   services:
     - docker:dind
   parallel:
diff --git a/config/files/bluebuild-logo/watermark.png b/config/files/bluebuild-logo/watermark.png
new file mode 100644
index 0000000..fbdc6d0
Binary files /dev/null and b/config/files/bluebuild-logo/watermark.png differ
diff --git a/config/scripts/initramfs.sh b/config/scripts/initramfs.sh
new file mode 100644
index 0000000..3bab6e8
--- /dev/null
+++ b/config/scripts/initramfs.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Only install cliwrap if it's not already installed
+# Usually needed when doing kernel-related changes with classic Fedora tools
+# so those tools are aware of ostree nature of Fedora Atomic & adapt to it
+# https://coreos.github.io/rpm-ostree/cliwrap/
+if [[ ! -f "/usr/libexec/rpm-ostree/wrapped/dracut" ]]; then
+  echo "Installing cliwrap"
+  rpm-ostree cliwrap install-to-root /
+else
+  echo "Cliwrap is already installed"
+fi
+
+QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
+/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "${QUALIFIED_KERNEL}" --reproducible -v --add ostree -f "/lib/modules/${QUALIFIED_KERNEL}/initramfs.img"
+chmod 0600 "/lib/modules/${QUALIFIED_KERNEL}/initramfs.img"
diff --git a/recipes/common/bluebuild-logo.yml b/recipes/common/bluebuild-logo.yml
new file mode 100644
index 0000000..95480e8
--- /dev/null
+++ b/recipes/common/bluebuild-logo.yml
@@ -0,0 +1,7 @@
+modules:
+  - type: files
+    files:
+      - bluebuild-logo: /usr/share/plymouth/themes/spinner/
+  - type: script
+    scripts:
+      - initramfs.sh
diff --git a/recipes/common/jp-common.yml b/recipes/common/jp-common.yml
index 7e0437f..d544539 100644
--- a/recipes/common/jp-common.yml
+++ b/recipes/common/jp-common.yml
@@ -13,3 +13,4 @@ modules:
     nerd-fonts:
       - JetBrainsMono
       - NerdFontsSymbolsOnly
+  - from-file: common/bluebuild-logo.yml