diff --git a/bash/bash_aliases b/bash/bash_aliases
index edf2d8e83..2d0a7b3ae 100644
--- a/bash/bash_aliases
+++ b/bash/bash_aliases
@@ -54,12 +54,6 @@ alias isdistrobox='[ -f "/run/.toolboxenv" ] && grep -oP "(?<=name=\")[^\";]+" /
 # Flag that the directory was just changed (used with prompt)
 alias cd='export DIRCHANGED="1"; cd'
 
-if [ "$(isdistrobox)" ]; then
-    source "$HOME/.dotfiles/bash/bash_aliases.distrobox"
-else
-    source "$HOME/.dotfiles/bash/bash_aliases.host"
-fi
-
 if [ -f /etc/os-release ]; then
     export OS=`grep -P '^ID=' /etc/os-release | cut -d'=' -f2 | sed 's/"//g'`
     if [ -f ${HOME}/.dotfiles/bash/bash_aliases.$OS ]; then
@@ -73,3 +67,10 @@ if [ -f /etc/os-release ]; then
         source ${HOME}/.dotfiles/bash/bash_aliases.$OS-$OSVARIANT
     fi
 fi
+
+if [ "$(isdistrobox)" ]; then
+    source "$HOME/.dotfiles/bash/bash_aliases.distrobox"
+else
+    source "$HOME/.dotfiles/bash/bash_aliases.host"
+fi
+
diff --git a/bash/bash_aliases.debian b/bash/bash_aliases.debian
index eaf074c83..6cb8f4366 100644
--- a/bash/bash_aliases.debian
+++ b/bash/bash_aliases.debian
@@ -1 +1 @@
-alias upgrade="sudo apt-get update; sudo apt-get full-upgrade -y; sudo apt-get autoremove -y; sudo apt-get clean -y;"
+alias upgrade="sudo apt-get update; sudo apt-get full-upgrade -y; sudo apt-get autoremove -y; sudo apt-get clean -y"
diff --git a/bash/bash_aliases.host b/bash/bash_aliases.host
index a7a973712..adeefed45 100644
--- a/bash/bash_aliases.host
+++ b/bash/bash_aliases.host
@@ -6,3 +6,4 @@ alias butane='podman run --rm --interactive       \
               --security-opt label=disable        \
               --volume ${PWD}:/pwd --workdir /pwd \
               quay.io/coreos/butane:release'
+alias upgrade="$(alias upgrade | cut -d"'" -f 2); sudo flatpak upgrade -y; sudo flatpak uninstall --unused""