diff --git a/roles/home-gui/files/gnome-setup.sh b/roles/home-gui/files/gnome-setup.sh
index 3209bf9..85400f7 100644
--- a/roles/home-gui/files/gnome-setup.sh
+++ b/roles/home-gui/files/gnome-setup.sh
@@ -3,18 +3,11 @@
 test -x /usr/bin/gsettings || (echo "gsettings not found" && exit 1)
 
 set_favorites_bar () {
-    local firefox
-    if [ -r /usr/share/applications/firefox-esr.desktop ] && [ ! -r /usr/share/applications/firefox.desktop ]
-    then
-        firefox=firefox-esr
-    else
-        firefox=firefox
-    fi
     if [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/favorite-apps.conf" ]
     then
         gsettings set org.gnome.shell favorite-apps "$(cat "${XDG_CONFIG_HOME:-$HOME/.config}/favorite-apps.conf")"
     else
-        gsettings set org.gnome.shell favorite-apps "['org.gnome.Terminal.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', '$firefox.desktop', 'org.keepassxc.KeePassXC.desktop']"
+        gsettings set org.gnome.shell favorite-apps "['org.gnome.Terminal.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'org.mozilla.firefox.desktop', 'org.keepassxc.KeePassXC.desktop']"
     fi
 }
 set_favorites_bar
@@ -141,8 +134,8 @@ set_misc_preferences () {
     gsettings set org.gnome.desktop.a11y always-show-universal-access-status true
 
     # Set Gnome Clocks locations.
-    # America/New_York; America/Halifax; Europe/London; Europe/Paris.
-    gsettings set org.gnome.clocks world-clocks "[{'location': <(uint32 2, <('Seattle', 'KBFI', true, [(0.82983133145337307, -2.134775231953554)], [(0.83088509144255718, -2.135097419733472)])>)>}, {'location': <(uint32 2, <('Halifax', 'CYHZ', true, [(0.78336194011902394, -1.1082840750163994)], [(0.77928951101546806, -1.1100294042683936)])>)>}, {'location': <(uint32 2, <('London', 'EGWU', false, [(0.89971722940307675, -0.007272211034407213)], [(0.89971722940307675, -0.007272211034407213)])>)>}, {'location': <(uint32 2, <('Berlin', 'EDDT', true, [(0.91746141594945008, 0.23241968454167572)], [(0.91658875132345297, 0.23387411976724018)])>)>}]"
+    # America/Seattle; America/Halifax; Etc/UTC; Europe/London; Europe/Berlin.
+    gsettings set org.gnome.clocks world-clocks "[{'location': <(uint32 2, <('Seattle', 'KBFI', true, [(0.82983133145337307, -2.134775231953554)], [(0.83088509144255718, -2.135097419733472)])>)>}, {'location': <(uint32 2, <('Halifax', 'CYHZ', true, [(0.78336194011902394, -1.1082840750163994)], [(0.77928951101546806, -1.1100294042683936)])>)>}, {'location': <(uint32 2, <('Coordinated Universal Time (UTC)', '@UTC', false, @a(dd) [], @a(dd) [])>)>}, {'location': <(uint32 2, <('London', 'EGWU', false, [(0.89971722940307675, -0.007272211034407213)], [(0.89971722940307675, -0.007272211034407213)])>)>}, {'location': <(uint32 2, <('Berlin', 'EDDT', true, [(0.91746141594945008, 0.23241968454167572)], [(0.91658875132345297, 0.23387411976724018)])>)>}]"
 
     # Enable Night Light.
     gsettings set org.gnome.settings-daemon.plugins.color night-light-enabled 'true'
diff --git a/roles/home-gui/tasks/flatpak.yml b/roles/home-gui/tasks/flatpak.yml
index d26bd54..bbaac5b 100644
--- a/roles/home-gui/tasks/flatpak.yml
+++ b/roles/home-gui/tasks/flatpak.yml
@@ -26,21 +26,9 @@
     method: user
   when: flatpak.stat.exists == true
 
-- name: Install VLC flatpak
+- name: Install Firefox flatpak
   community.general.flatpak:
-    name: org.videolan.VLC
-    state: present
-    method: user
-  when: flatpak.stat.exists == true
-
-# Chromium sometimes crashes at launch. It requires the "run in background"
-# Flatpak permission. Verify this with:
-#   flatpak permission-show org.chromium.Chromium
-# Fix it with:
-#   flatpak permission-set background background org.chromium.Chromium yes
-- name: Install Chromium flatpak
-  community.general.flatpak:
-    name: org.chromium.Chromium
+    name: org.mozilla.firefox
     state: present
     method: user
   when: flatpak.stat.exists == true