diff --git a/justfile b/justfile
index 32fcc63..974d7f0 100644
--- a/justfile
+++ b/justfile
@@ -1,52 +1,3 @@
-# Configure the Nvidia driver
-_configure-nvidia ACTION="prompt":
-    #!/usr/bin/bash
-    source /usr/lib/ujust/ujust.sh
-    OPTION={{ ACTION }}
-    if [ "$OPTION" == "prompt" ]; then
-      echo "${bold}Configuring Nvidia drivers${normal}"
-      echo 'What would you like to do?'
-      OPTION=$(ugum choose "Set needed kernel arguments" "Remove kernel arguments")
-    elif [ "$OPTION" == "help" ]; then
-      echo "Usage: ujust configure-nvidia <option>"
-      echo "  <option>: Specify the quick option - 'kargs', 'test-cuda' or 'firefox-vaapi'"
-      echo "  Use 'kargs' to Set needed kernel arguments"
-      echo "  Use 'test-cuda' to Test CUDA support"
-      echo "  Use 'firefox-vaapi' to Enable Nvidia VAAPI in Firefox Flatpak."
-      exit 0
-    fi
-    if [ "$OPTION" == "Set needed kernel arguments" ] || [ "${OPTION,,}" == "kargs" ]; then
-        rpm-ostree kargs \
-          --append-if-missing=rd.driver.blacklist=nouveau \
-          --append-if-missing=modprobe.blacklist=nouveau \
-          --append-if-missing=nvidia-drm.modeset=1 \
-          --delete-if-present=nomodeset
-    elif [ "$OPTION" == "Remove kernel arguments" ] || [ "${OPTION,,}" == "remove-kargs" ]; then
-        rpm-ostree kargs \
-          --delete-if-present=rd.driver.blacklist=nouveau \
-          --delete-if-present=modprobe.blacklist=nouveau \
-          --delete-if-present=nvidia-drm.modeset=1 \
-          --append-if-missing=nomodeset
-    fi
-
-# Switch between Nvidia image and NVK
-toggle-nvk:
-    #!/usr/bin/bash
-    CURRENT_IMAGE=$(rpm-ostree status -b --json | jq -r '.deployments[0]."container-image-reference"' | sed -E 's/^.+\/(.+:.+)$/\1/')
-    CURRENT_URI=$(rpm-ostree status -b --json | jq -r '.deployments[0]."container-image-reference"' | sed -E 's/^(.+\/).+:.+$/\1/')
-    NEW_IMAGE=$CURRENT_IMAGE
-    CONFIG_ACTION=""
-    if [[ "$CURRENT_IMAGE" =~ "nvidia" ]]; then
-      NEW_IMAGE=${CURRENT_IMAGE/-nvidia/}
-      CONFIG_ACTION="kargs"
-    else
-      NEW_IMAGE=${CURRENT_IMAGE/:/-nvidia:}
-      CONFIG_ACTION="remove-kargs"
-    fi
-    echo "Rebasing to ${NEW_IMAGE}"
-    rpm-ostree rebase ${CURRENT_URI}${NEW_IMAGE}
-    just _configure-nvidia ${CONFIG_ACTION}
-
 generate-secureboot-key:
     openssl req -config ./openssl.cnf \
         -new -x509 -newkey rsa:2048 \
diff --git a/recipes/base-combo-nvidia.yml b/recipes/base-combo-nvidia.yml
index b618aea..33f3be7 100644
--- a/recipes/base-combo-nvidia.yml
+++ b/recipes/base-combo-nvidia.yml
@@ -11,7 +11,7 @@ modules:
   - type: systemd
     system:
       enabled:
-        - sddm
+        - sddm-greeter
       disabled:
         - cosmic-greeter
   - from-file: base/post-build.yml
diff --git a/recipes/base-combo.yml b/recipes/base-combo.yml
index 4aa0bc9..ebe2553 100644
--- a/recipes/base-combo.yml
+++ b/recipes/base-combo.yml
@@ -11,7 +11,7 @@ modules:
   - type: systemd
     system:
       enabled:
-        - sddm
+        - sddm-greeter
       disabled:
         - cosmic-greeter
   - from-file: base/post-build.yml
diff --git a/recipes/base/kinoite.yml b/recipes/base/kinoite.yml
index b09ffa7..0c1bd7d 100644
--- a/recipes/base/kinoite.yml
+++ b/recipes/base/kinoite.yml
@@ -31,4 +31,4 @@ modules:
   - type: systemd
     system:
       enabled:
-        - sddm
+        - sddm-greeter
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index 9f24821..5400fc9 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -7,6 +7,7 @@ name: jp-desktop-nvidia
 
 # Custom Base
 base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo-nvidia
+# base-image: registry.gitlab.com/wunker-bunker/wunker-os/cosmic-nvidia
 image-version: 42
 description: The image of Wunker OS for JP's desktop gaming.
 blue-build-tag: none