diff --git a/package_config/HW4F_DESKTOP b/package_config/HW4F_DESKTOP
index eb49959..ecdc353 100644
--- a/package_config/HW4F_DESKTOP
+++ b/package_config/HW4F_DESKTOP
@@ -10,5 +10,7 @@ libreoffice
 libreoffice-l10n-de
 libreoffice-help-de
 gnome-software
+gnome-software-plugin-flatpak
+flatpak
 ubuntu-snappy
 snapd
diff --git a/scripts/HW4F_DESKTOP_LAST/50-flatpak b/scripts/HW4F_DESKTOP_LAST/50-flatpak
new file mode 100755
index 0000000..c88acc1
--- /dev/null
+++ b/scripts/HW4F_DESKTOP_LAST/50-flatpak
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo