diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml
index 97d9aaa..2673f16 100644
--- a/dot_config/topgrade.toml
+++ b/dot_config/topgrade.toml
@@ -3,7 +3,7 @@
 #assume_yes = true
 
 # Disable specific steps - same options as the command line flag
-disable = ["firmware", "tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "flatpak", "shell", "rustup", "dotnet", "vscode", "powershell", "snap"]
+disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell"]
 
 # Skip Notify
 skip_notify = true
@@ -21,7 +21,7 @@ skip_notify = true
 #run_in_tmux = true
 
 # List of remote machines with Topgrade installed on them
-remote_topgrades = ["chat", "db", "git", "java", "kali", "mail", "misc", "mon"]
+remote_topgrades = ["pxm", "web", "infra"]
 
 # Arguments to pass SSH when upgrading remote systems
 #ssh_arguments = "-o ConnectTimeout=2"
diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv
index d999060..b19a95b 100644
--- a/dot_config/zsh/dot_zshenv
+++ b/dot_config/zsh/dot_zshenv
@@ -3,7 +3,7 @@ export XDG_CACHE_HOME="$HOME"/.cache
 export XDG_CONFIG_HOME="$HOME"/.config
 export XDG_CONFIG_DIRS=/etc/xdg
 export XDG_DATA_HOME="$HOME"/.local/share
-export XDG_DATA_DIRS=/usr/local/share:/usr/share
+export XDG_DATA_DIRS=/usr/local/share:/usr/share:/var/lib/flatpak/exports/share:"$XDG_DATA_HOME"/flatpak/exports/share
 export XDG_STATE_HOME="$HOME"/.local/state
 export XDG_DESKTOP_DIR=$HOME/Desktop
 export XDG_DOCUMENTS_DIR="$HOME"/Documents