diff --git a/_toc.yml b/_toc.yml
index 7c480101..1d254c0e 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -77,6 +77,7 @@ chapters:
               - file: admin-guide/configuration/software/selinux_configuration
               - file: admin-guide/configuration/software/package_updates
               - file: admin-guide/configuration/software/package_repositories
+              - file: admin-guide/configuration/software/flatpak_remotes
               - file: admin-guide/configuration/software/python
               - file: admin-guide/configuration/software/conda
               - file: admin-guide/configuration/software/labview
diff --git a/admin-guide/configuration/software/flatpak_remotes.md b/admin-guide/configuration/software/flatpak_remotes.md
new file mode 100644
index 00000000..f0c1f64d
--- /dev/null
+++ b/admin-guide/configuration/software/flatpak_remotes.md
@@ -0,0 +1,29 @@
+# Adding Flatpak Repositories/Remotes
+
+## Flatpak Repository List
+All flatpak remotes to be available on the system are listed in Hiera in the list `flatpak::repos::default`, like
+```
+rpm_repos::default:
+    - 'cpt'
+```
+
+
+## Flatpak Repository Definition
+
+An individual flatpak remote is configured in Hiera within the namespace `flatpak::repo::*`, like following example:
+
+```
+flatpak::repo::flathub: |
+  [Flatpak Repo]
+  Title=Flathub
+  Url=https://flathub.psi.ch/repo/
+  Homepage=https://flathub.org/
+  Comment=Central repository of Flatpak applications (PSI CachingMirror)
+  Description=Central repository of Flatpak applications (PSI CachingMirror)
+  Icon=https://flathub.psi.ch/repo/logo.svg
+  GPGKey=mQINBFl...
+```
+
+The content is a single string in the [`.flatpakrepo` format](https://docs.flatpak.org/en/latest/flatpak-command-reference.html#flatpakrepo).
+
+Usually the Flatpak repository will provide such a file.
diff --git a/admin-guide/configuration/software/packages.md b/admin-guide/configuration/software/packages.md
index ee116d26..057b4938 100644
--- a/admin-guide/configuration/software/packages.md
+++ b/admin-guide/configuration/software/packages.md
@@ -90,7 +90,7 @@ Note that packages installed with `pip` are not updated automatically!
 
 ## Install Software using Flatpak
 
-The `flatpak` tag can be used to install a software via flatpak. Best use the full Flatpak Application ID, like `pygame-utility`:
+The `flatpak` tag can be used to install a software via flatpak. Best use the full Flatpak Application ID, like `dev.zed.Zed`:
 
 ```yaml
 base::pkg_group::my_flatpak_software: