diff --git a/data/cloudData.json b/data/cloudData.json
new file mode 100644
index 0000000..3be6016
--- /dev/null
+++ b/data/cloudData.json
@@ -0,0 +1,72 @@
+{
+    "id": "67bb89e1e3e60eeff6099cd6",
+    "kind": "kbuild",
+    "name": "kbuild-gcc-12-arm64",
+    "path": [
+      "checkout",
+      "kbuild-gcc-12-arm64"
+    ],
+    "group": "kbuild-gcc-12-arm64",
+    "parent": "67bb8962e3e60eeff6099c81",
+    "state": "done",
+    "result": "pass",
+    "artifacts": {
+      "metadata": "",
+      "kernel": "",
+      "vmlinux": "",
+      "modules": "",
+      "kselftest_tar_gz": "https://files.kernelci.org/kbuild-gcc-12-arm64-681a3b1cea9ae9de13450f99/kselftest.tar.gz",
+      "ramdisk": "",
+      "firmware": ""
+    },
+    "data": {
+      "kernel_revision": {
+        "tree": "qcom-next",
+        "url": "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git",
+        "branch": "main",
+        "commit": "d082ecbc71e9e0bf49883ee4afd435a77a5101b6",
+        "describe": "v6.14-rc4",
+        "version": {
+          "version": 6,
+          "patchlevel": 14,
+          "sublevel": null,
+          "extra": "-rc4",
+          "name": null
+        },
+        "patchset": null,
+        "commit_tags": [
+          "v6.14-rc4"
+        ],
+        "commit_message": "Commit msg",
+        "tip_of_branch": true
+      },
+      "arch": "arm64",
+      "defconfig": "defconfig",
+      "compiler": "gcc-12",
+      "error_code": null,
+      "error_msg": null,
+      "fragments": [
+        "lab-setup",
+        "kselftest"
+      ],
+      "config_full": "defconfig+lab-setup+kselftest",
+      "platform": "kubernetes",
+      "runtime": "k8s-all",
+      "job_id": "kci-67bb89e1e3e60eeff6099cd6-kbuild-gcc-12-arm64-q2ku8gjy",
+      "job_context": "gke_android-kernelci-external_us-east4-c_kci-big-us-east4",
+      "kernel_type": "image",
+      "regression": null
+    },
+    "debug": {},
+    "jobfilter": null,
+    "platform_filter": [],
+    "created": "2025-02-23T20:49:37.894000",
+    "updated": "2025-02-23T21:54:02.506000",
+    "timeout": "2025-02-24T02:49:37.894000",
+    "holdoff": null,
+    "owner": "production",
+    "submitter": "service:pipeline",
+    "treeid": "a9333d0b6537440630a6eb4bb2aa093d4c191a0703c6792449f06702a1704a69",
+    "user_groups": [],
+    "processed_by_kcidb_bridge": true
+  }
diff --git a/data/metadata.json b/data/metadata.json
new file mode 100644
index 0000000..2554ede
--- /dev/null
+++ b/data/metadata.json
@@ -0,0 +1,17 @@
+{
+    "build": {
+        "arch": "arm64",
+        "compiler": "gcc-12",
+        "defconfig": "defconfig",
+        "fragments": [
+            "lab-setup",
+            "kselftest"
+        ],
+        "srcdir": "/tmp/kci/linux",
+        "config_full": "defconfig+lab-setup+kselftest",
+        "result": "pass"
+    },
+    "artifacts": {
+        "dtbs/qcom/qcs6490-rb3gen2.dtb": ""
+    }
+}
diff --git a/templates/boot/fastboot.jinja2 b/templates/boot/fastboot.jinja2
index 0d8b469..f3086c1 100644
--- a/templates/boot/fastboot.jinja2
+++ b/templates/boot/fastboot.jinja2
@@ -4,8 +4,10 @@
         url: '{{ node.artifacts.kernel }}'
       dtb:
         url: '{{ node.artifacts.dtb }}'
-      ramdisk:
+      ramdisk_firmware:
         url: '{{ node.artifacts.ramdisk }}'
+      ramdisk:
+        url: '{{ node.artifacts.firmware }}'
         compression: gz
         format: cpio.newc
         overlays:
@@ -13,12 +15,13 @@
 {% filter indent(width=10) %}
 {% block testoverlays %}{% endblock %}
 {% endfilter %}
-{% set dtb = device_dtb.split('/')[-1] %}
+{% set dtb = device_dtb.split('/')[-1].split('?')[0] %}
     postprocess:
       docker:
         image: ghcr.io/mwasilew/docker-mkbootimage:master
         steps:
-        - mkbootimg --header_version 2 --kernel Image --dtb {{ dtb }} --cmdline "console=ttyMSM0,115200n8 earlycon qcom_geni_serial.con_enabled=1 kernel.sched_pelt_multiplier=4 mem_sleep_default=s2idle mitigations=auto video=efifb:off" --ramdisk rootfs.cpio.gz --output boot.img
+        - cat initramfs-kerneltest-full-image-qcom-armv8a.cpio.gz initramfs-firmware-rb3gen2-image-qcom-armv8a.cpio.gz > merged-initramfs.cpio.gz
+        - mkbootimg --header_version 2 --kernel Image --dtb {{ dtb }} --cmdline "console=ttyMSM0,115200n8 earlycon qcom_geni_serial.con_enabled=1 kernel.sched_pelt_multiplier=4 mem_sleep_default=s2idle mitigations=auto video=efifb:off" --ramdisk merged-initramfs.cpio.gz --output boot.img
     to: downloads
 
 - deploy:
@@ -31,7 +34,7 @@
 
 - boot:
     prompts:
-    - '/ #'
+    - '~#'
     failure_retry: 3
     timeout:
       minutes: 10
@@ -40,4 +43,4 @@
         minutes: 3
       auto-login-action:
         minutes: 10
-    method: fastboot
\ No newline at end of file
+    method: fastboot
diff --git a/templates/overlays/baseline.jinja2 b/templates/overlays/baseline.jinja2
index 7d8e937..3e07566 100644
--- a/templates/overlays/baseline.jinja2
+++ b/templates/overlays/baseline.jinja2
@@ -11,9 +11,4 @@ kselftest:
   format: tar
   path: /kselftest
   url: {{ node.artifacts.kselftest_tar_gz }}
-firmware:
-  compression: gz
-  format: tar
-  path: /
-  url: {{ node.artifacts.firmware }}
-{%- endblock -%}
\ No newline at end of file
+{%- endblock -%}