diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml
index 398bdf74..899633fd 100644
--- a/.github/workflows/build-iso.yml
+++ b/.github/workflows/build-iso.yml
@@ -59,9 +59,10 @@ jobs:
           iso_name: ${{ matrix.image_name }}.iso
           enable_cache_dnf: "false"
           enable_cache_skopeo: "false"
-          # enable_flatpak_dependencies: "false"
-          # flatpak_remote_name: "flathub-system"
-          # flatpak_remote_url: "https://flathub.org/repo/flathub.flatpakrepo"
+          enable_flatpak_dependencies: "true"
+          flatpak_remote_name: "flathub"
+          flatpak_remote_url: "https://flathub.org/repo/flathub.flatpakrepo"
+          flatpak_remote_refs_dir: "files/flatpaks/gnome"
 
       - name: Move ISO to Upload Directory
         id: upload-directory
diff --git a/files/flatpaks/gnome/gnome-flatpaks b/files/flatpaks/gnome/gnome-flatpaks
new file mode 100644
index 00000000..469fd4aa
--- /dev/null
+++ b/files/flatpaks/gnome/gnome-flatpaks
@@ -0,0 +1,22 @@
+app/org.gnome.Calculator/x86_64/stable
+app/org.gnome.Calendar/x86_64/stable
+app/org.gnome.Characters/x86_64/stable
+app/org.gnome.clocks/x86_64/stable
+app/org.gnome.Contacts/x86_64/stable
+app/org.gnome.Decibels/x86_64/stable
+app/org.gnome.baobab/x86_64/stable
+app/org.gnome.SimpleScan/x86_64/stable
+app/org.gnome.Papers/x86_64/stable
+app/org.gnome.font-viewer/x86_64/stable
+app/org.gnome.Logs/x86_64/stable
+app/org.gnome.Loupe/x86_64/stable
+app/org.gnome.Maps/x86_64/stable
+app/net.nokyan.Resources/x86_64/stable
+app/org.gnome.Showtime/x86_64/stable
+app/org.gnome.TextEditor/x86_64/stable
+app/org.gnome.Weather/x86_64/stable
+app/org.gnome.Epiphany/x86_64/stable
+app/com.github.tchx84.Flatseal/x86_64/stable
+app/org.gnome.World.PikaBackup/x86_64/stable
+app/io.github.flattool.Warehouse/x86_64/stable
+runtime/org.gtk.Gtk3theme.adw-gtk3/x86_64/3.22
diff --git a/files/system_files/shared/usr/share/ublue-os/just/60-custom.just b/files/system_files/shared/usr/share/ublue-os/just/60-custom.just
index b1617672..c73db2db 100644
--- a/files/system_files/shared/usr/share/ublue-os/just/60-custom.just
+++ b/files/system_files/shared/usr/share/ublue-os/just/60-custom.just
@@ -1,5 +1,19 @@
 # Include some of your custom scripts here!
 
+# Restore default apps installation
+restore-default-apps:
+  #!/usr/bin/bash
+  IMAGE_INFO="/usr/share/zeliblue/image-info.json"
+  IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
+  if [[ ${IMAGE_FLAVOR} == 'silverblue' ]]; then
+    FLATPAKS="gnome/gnome-flatpaks"
+  # TODO: Add Kinoite flatpaks list
+  # elif [[ ${IMAGE_FLAVOR} == 'kinoite' ]]; then
+  #   FLATPAKS="plasma/plasma-flatpaks"
+  fi
+  FLATPAK_LIST="$(curl https://raw.githubusercontent.com/zelikos/zeliblue/main/files/flatpaks/${FLATPAKS} | tr '\n' ' ')"
+  flatpak --system -y install --or-update ${FLATPAK_LIST}
+
 # Install a small selection of CLI utilties via brew
 zeliblue-cli:
   #!/usr/bin/bash
diff --git a/recipes/common/common-flatpaks.yml b/recipes/common/common-flatpaks.yml
index 6ae194e9..ff934d13 100644
--- a/recipes/common/common-flatpaks.yml
+++ b/recipes/common/common-flatpaks.yml
@@ -1,6 +1,6 @@
 type: default-flatpaks
 system:
-  repo-name: flathub-system
+  repo-name: flathub
   repo-title: "Flathub (system-wide)"
 user:
   repo-name: flathub-user
diff --git a/recipes/gnome/gnome-base.yml b/recipes/gnome/gnome-base.yml
index 8c1feb35..1c7424b1 100644
--- a/recipes/gnome/gnome-base.yml
+++ b/recipes/gnome/gnome-base.yml
@@ -1,5 +1,4 @@
 modules:
   - from-file: gnome/gnome-files.yml
   - from-file: gnome/gnome-packages.yml
-  - from-file: gnome/gnome-flatpaks.yml
   - from-file: gnome/gnome-gschemas.yml
diff --git a/recipes/gnome/zeliblue-testing.yml b/recipes/gnome/zeliblue-testing.yml
index aaba7574..d5a92487 100644
--- a/recipes/gnome/zeliblue-testing.yml
+++ b/recipes/gnome/zeliblue-testing.yml
@@ -43,5 +43,4 @@ modules:
       - gnome-software-rpm-ostree
       - gnome-tweaks
 
-  - from-file: gnome/gnome-flatpaks.yml
   - from-file: gnome/gnome-gschemas.yml