diff --git a/.github/workflows/bootc-revdep.yml b/.github/workflows/bootc-revdep.yml
index decbf2a9..dcde0853 100644
--- a/.github/workflows/bootc-revdep.yml
+++ b/.github/workflows/bootc-revdep.yml
@@ -22,7 +22,7 @@ jobs:
   bootc-test:
     name: Build and test bootc with local composefs-rs
     runs-on: ubuntu-24.04
-    timeout-minutes: 60
+    timeout-minutes: 120
 
     steps:
       - name: Checkout repository
diff --git a/bootc/Justfile b/bootc/Justfile
index c040ded5..3fee6816 100644
--- a/bootc/Justfile
+++ b/bootc/Justfile
@@ -59,8 +59,9 @@ patch: clone
     {
         echo ''
         echo '# Patched by composefs-rs CI to test against local composefs-rs'
-        echo '[patch."https://github.com/containers/composefs-rs"]'
+        echo '[patch."https://github.com/composefs/composefs-rs"]'
         echo "composefs = { path = \"$_COMPOSEFS_SRC/crates/composefs\" }"
+        echo "cfsctl = { path = \"$_COMPOSEFS_SRC/crates/cfsctl\" }"
         echo "composefs-boot = { path = \"$_COMPOSEFS_SRC/crates/composefs-boot\" }"
         echo "composefs-oci = { path = \"$_COMPOSEFS_SRC/crates/composefs-oci\" }"
     } >> Cargo.toml
@@ -70,7 +71,7 @@ patch: clone
     sed -i 's/missing_docs = "deny"/missing_docs = "allow"/' Cargo.toml
 
     # Update Cargo.lock so the patch is recognized by cargo xtask local-rust-deps
-    cargo update composefs composefs-boot composefs-oci
+    cargo update composefs cfsctl composefs-boot composefs-oci
 
     echo "bootc patched successfully"
 
@@ -85,12 +86,12 @@ build: patch
 
 # Run bootc composefs tests using local composefs-rs
 # Since the patch uses real local paths, no symlinks or special env vars needed
-test: build
+test bootloader="grub" filesystem="ext4": build
     #!/bin/bash
     set -euo pipefail
     cd "$COMPOSEFS_BOOTC_PATH"
-    echo "Running bootc composefs tests..."
-    just test-composefs
+    echo "Running bootc composefs tests (bootloader={{bootloader}}, filesystem={{filesystem}})..."
+    just test-composefs {{bootloader}} {{filesystem}}
 
 # Clean the bootc checkout and any patches
 clean:
@@ -120,6 +121,11 @@ config:
       COMPOSEFS_BOOTC_REF  - Override bootc git ref (branch/tag/PR)
       COMPOSEFS_BOOTC_REPO - Override bootc git repository
 
+    Test Parameters:
+      just bootc/test                            # Default: grub + ext4
+      just bootc/test systemd ext4               # systemd-boot + ext4
+      just bootc/test grub xfs                   # grub + xfs
+
     Example Usage:
       just bootc/build                                      # Clone main, patch, and build
       COMPOSEFS_BOOTC_REF=v1.2.0 just bootc/build           # Use specific tag