diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fab615..42d5135 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,6 @@ include:
       - RECIPE:
           - recipe-desktop.yml
           - recipe-framework-13.yml
-        USER: jp
+        USER_NAME: jp
       - RECIPE: recipe-cp.yml
-        USER: cp
+        USER_NAME: cp
diff --git a/Containerfile.cp b/Containerfile.cp
index 79eabaa..5a99583 100644
--- a/Containerfile.cp
+++ b/Containerfile.cp
@@ -11,7 +11,8 @@ ARG BASE_IMAGE_URL=ghcr.io/ublue-os/cinnamon-main
 
 FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
 
-ARG USR_DIR=usr-cp
+ARG USER_NAME=cp
+ARG USR_DIR=usr-${USER_NAME}
 
 # The default recipe set to the recipe's default filename
 # so that `podman build` should just work for many people.
diff --git a/Containerfile.jp b/Containerfile.jp
index 499f076..384bd3b 100644
--- a/Containerfile.jp
+++ b/Containerfile.jp
@@ -11,7 +11,8 @@ ARG BASE_IMAGE_URL=ghcr.io/ublue-os/kinoite-main
 
 FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
 
-ARG USR_DIR=usr-jp
+ARG USER_NAME=jp
+ARG USER_DIR=usr-${USER_NAME}
 
 # The default recipe set to the recipe's default filename
 # so that `podman build` should just work for many people.
diff --git a/recipe-desktop.yml b/recipe-desktop.yml
index 0a95d53..3ba78cf 100644
--- a/recipe-desktop.yml
+++ b/recipe-desktop.yml
@@ -1,7 +1,7 @@
 name: desktop
 base-image: ghcr.io/ublue-os/kinoite-nvidia
 fedora-version: 38
-description: The image of Wunker OS for an Nvidia based desktop meant for gaming. Make your own! https://ublue.it/making-your-own/
+description: The image of Wunker OS for an Nvidia based desktop meant for gaming.
 scripts:
   pre:
     - autorun.sh
diff --git a/recipe-framework-13.yml b/recipe-framework-13.yml
index 2e74fa8..a99d19d 100644
--- a/recipe-framework-13.yml
+++ b/recipe-framework-13.yml
@@ -1,7 +1,7 @@
 name: framework-13
 base-image: ghcr.io/ublue-os/kinoite-main
 fedora-version: 38
-description: The image of Wunker OS for a Framework laptop. Make your own! https://ublue.it/making-your-own/
+description: The image of Wunker OS for a Framework laptop.
 scripts:
   pre:
     - autorun.sh
diff --git a/usr/share/ublue-os/firstboot/yafti.yml b/usr/share/ublue-os/firstboot/yafti.yml
index 3a9d0f4..4b68448 100644
--- a/usr/share/ublue-os/firstboot/yafti.yml
+++ b/usr/share/ublue-os/firstboot/yafti.yml
@@ -1,11 +1,11 @@
-title: Welcome to uBlue
+title: Welcome to Wunker OS!
 properties:
   mode: "run-on-change"
 screens:
   first-screen:
     source: yafti.screen.title
     values:
-      title: "Welcome to uBlue (Alpha)"
+      title: "Welcome to Wunker OS!"
       icon: "/path/to/icon"
       description: |
         This guided installer will help you get started with your new system.
@@ -50,8 +50,8 @@ screens:
       show_terminal: true
       package_manager: yafti.plugin.flatpak
       package_manager_defaults:
-        user: false
-        system: true
+        user: true
+        system: false
       groups:
         Core GNOME Apps:
           description: Core system applications for the GNOME desktop environment.
@@ -79,7 +79,7 @@ screens:
             - Weather: org.gnome.Weather
         System Apps:
           description: System applications for all desktop environments.
-          default: true
+          default: false
           packages:
             - Deja Dup Backups: org.gnome.DejaDup
             - Fedora Media Writer: org.fedoraproject.MediaWriter
@@ -132,12 +132,10 @@ screens:
     values:
       title: "All done!"
       icon: "/path/to/icon"
-      links:
-        - "Install More Applications":
-            run: /usr/bin/gnome-software
-        - "Website":
-            run: /usr/bin/xdg-open https://ublue.it
-        - "Join the Discord Community":
-            run: /usr/bin/xdg-open https://discord.gg/XjG48C7VHx
+      # links:
+      #   - "Website":
+      #       run: /usr/bin/xdg-open https://ublue.it
+      #   - "Join the Discord Community":
+      #       run: /usr/bin/xdg-open https://discord.gg/XjG48C7VHx
       description: |
-        Thanks for trying uBlue, we hope you enjoy it!
+        Thanks for using Wunker OS, we hope you enjoy it!