diff --git a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
index 657f57dd..68d039a3 100644
--- a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -11,15 +11,20 @@ screens:
       description: |
         Configure your system to get started. Completion of this process is required for Game mode to function.
   sign-image:
-    source: yafti.screen.consent
-    condition:
-      run: grep -qvz "signed" <<< $(rpm-ostree status)
+    source: yafti.screen.package
     values:
-      title: Sign Bazzite
-      description: |
-        This will sign your current install of Bazzite. Note that this may take awhile.
-      actions:
-        - run: just --unstable sign-image
+      title: Signing Bazzite
+      condition:
+        run: grep -qvz "signed" <<< $(rpm-ostree status)
+      show_terminal: true
+      package_manager: yafti.plugin.run
+      groups:
+        Sign Bazzite:
+          description: |
+            This will sign your current install of Bazzite. Mandatory for offline installs. This will take awhile.
+          default: true
+          packages:
+          - Sign Bazzite: just --unstable sign-image
   configure-bazzite:
     source: yafti.screen.package
     values:
diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
index eca94a1b..8dbd3ff9 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -11,15 +11,20 @@ screens:
       description: |
         Configure your system to get started
   sign-image:
-    source: yafti.screen.consent
-    condition:
-      run: grep -qvz "signed" <<< $(rpm-ostree status)
+    source: yafti.screen.package
     values:
-      title: Sign Bazzite
-      description: |
-        This will sign your current install of Bazzite. Note that this may take awhile.
-      actions:
-        - run: just --unstable sign-image
+      title: Signing Bazzite
+      condition:
+        run: grep -qvz "signed" <<< $(rpm-ostree status)
+      show_terminal: true
+      package_manager: yafti.plugin.run
+      groups:
+        Sign Bazzite:
+          description: |
+            This will sign your current install of Bazzite. Mandatory for offline installs. This will take awhile.
+          default: true
+          packages:
+          - Sign Bazzite: just --unstable sign-image
   configure-bazzite-arch:
     source: yafti.screen.package
     values: