diff --git a/just/bluefin-apps.just b/just/bluefin-apps.just
index c6f509def3c..8c94494a2f0 100644
--- a/just/bluefin-apps.just
+++ b/just/bluefin-apps.just
@@ -10,7 +10,8 @@
 # fix-       = apply fix/patch/workaround for something
 # foo        = no verb is used for shortcuts or something deemed important enough to use a super memorable name
 
-alias cockpit := setup-cockpit
+cockpit:
+  @ujust setup-cockpit
 
 # Enable Cockpit for web-based system management | https://cockpit-project.org/
 setup-cockpit ACTION="":
@@ -66,7 +67,8 @@ setup-cockpit ACTION="":
       echo "Cockpit has been ${b}${red}disabled${n}"
     fi
 
-alias jetbrains-toolbox := install-jetbrains-toolbox
+jetbrains-toolbox:
+  @ujust install-jetbrains-toolbox
 
 # Install JetBrains Toolbox | https://www.jetbrains.com/toolbox-app/
 install-jetbrains-toolbox:
@@ -86,7 +88,8 @@ install-jetbrains-toolbox:
     echo "Launching JetBrains Toolbox"
     ./jetbrains-toolbox-"${BUILD_VERSION}"/jetbrains-toolbox
 
-alias incus := install-incus
+incus:
+  @ujust install-incus
 
 # Install and configure Incus
 install-incus:
diff --git a/just/bluefin-system.just b/just/bluefin-system.just
index 215361633a9..53d4e81534b 100644
--- a/just/bluefin-system.just
+++ b/just/bluefin-system.just
@@ -77,7 +77,8 @@ devmode:
         fi
     fi
 
-alias gnome-vrr := toggle-gnome-vrr
+gnome-vrr:
+  @ujust toggle-gnome-vrr
 
 # Enable or Disable Gnome-VRR
 toggle-gnome-vrr:
@@ -253,8 +254,14 @@ install-system-flatpaks:
 configure-grub:
     @/usr/libexec/configure-grub.sh
 
-alias rollback-helper := rebase-helper
-alias switch-channel := rebase-helper
+switch-channel:
+  @ujust rebase-helper
+
+switch-channels:
+  @ujust rebase-helper
+
+rollback-helper:
+  @ujust rebase-helper
 
 # Rebase assistant
 rebase-helper: