diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index 2a29310f8..0a9d3c285 100644
--- a/extra-repos/systemd/systemd-services/APKBUILD
+++ b/extra-repos/systemd/systemd-services/APKBUILD
@@ -6,7 +6,7 @@
 # How to add a new service file (5 steps):
 pkgname=systemd-services
 # 1. bump pkgver
-pkgver=26
+pkgver=27
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -80,7 +80,19 @@ _evolution_data_server_sources="
 	user/evolution-source-registry.service
 	user/evolution-user-prompter.service
 " # From https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/master/src/services
-_flatpak_sources="system/flatpak-system-helper.service user/flatpak-session-helper.service user/flatpak-portal.service"
+_flatpak_sources="
+	system/flatpak-system-helper.service
+	user/flatpak-session-helper.service
+	user/flatpak-portal.service
+	system-environment-generators/60-flatpak-system-only
+	user-environment-generators/60-flatpak
+	tmpfiles.d/flatpak.conf
+" # From
+# - https://github.com/flatpak/flatpak/blob/main/system-helper/flatpak-system-helper.service.in
+# - https://github.com/flatpak/flatpak/blob/main/session-helper/flatpak-session-helper.service.in
+# - https://github.com/flatpak/flatpak/blob/main/portal/flatpak-portal.service.in
+# - https://github.com/flatpak/flatpak/tree/main/env.d
+# - https://github.com/flatpak/flatpak/tree/main/data/tmpfiles.d
 _geoclue_sources="system/geoclue.service" # From https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/master/data/geoclue.service.in
 _gnome_clocks_sources="user/gnome-clocks.service"
 _hexagonrpcd_sources="system/hexagonrpcd-sdsp.service system/iio-sensor-proxy.d/hexagonrpcd.conf"
@@ -267,6 +279,9 @@ fda84bb8dc10fa613790ff3ac9d50a03f21fb32f793ba3641740be93136800f0f07ba53d6e4843d0
 0cfef56afeea103ca487b36f13665021bb349b8c890f023135a93c47d45cb58dd39ffe76212fb780546b1aaed8174e40345a961d7125f7d7ace5921e1dcc7ba9  system-flatpak-system-helper.service
 815a3072c211c85ff475ac7f2fb9c280b567b98777c0f7bf7fea4575b5eaa3b9a4003a08eb3b8cb5b2d7f9fb6525e04491e8d87013e2539ae3a574db647f97b1  user-flatpak-session-helper.service
 7a17986c0f0554f0b27a5933b3e04657323edb23047878616727863fdc748cb8d8fea978f43895341037e2d1512bbd492bdbc19c40419cd3e109345614645388  user-flatpak-portal.service
+62be7a7a7dce425fe8155f92ceab57aea52542687d27a2ce3cd9da0a80672381361fb3e4a8d58caf9cc02d80824a29e161ffb9f065f640b4481704851eb0378a  system-environment-generators-60-flatpak-system-only
+2d1337da0d1ac7ea5d6ffefbe05621970fef491278028589f5095ee6072867977eca7a68a997d6870e450546c2077d999207fadb568ab611833769555bfb5c64  user-environment-generators-60-flatpak
+ae2d20da95e519041f6eca39dd140895b2c46284f0894c60a29cf56b87704805146ddc2435e46e7fffbfc8bcab2cabceb32a10804ba1b648e2ed041c0b056102  tmpfiles.d-flatpak.conf
 f3463b85ac47055b400dfd2e24694c5e1dc6ab039efac0fe54496fc027c0732cda5e52a362a497b372dea671dc615154e8abfea866728d243cbbcd25e68a91aa  system-geoclue.service
 bc7987a001d2076788d904f1ea6d3e97a2ab905ee55302ffb90402133c2b9fb760d7ad94e06971d811b9d905048e164cb78355f8cd087219b5b8ff6dab2fbd9c  user-gnome-clocks.service
 b009a1494f84705dcbea664823e24fb18f326ca84017d9c470ef55c0225d519993aacacf76b24c895ee926dbc2b3269ebc6b2a353cda5ad1b732af5624941a6a  system-hexagonrpcd-sdsp.service
diff --git a/extra-repos/systemd/systemd-services/system-environment-generators-60-flatpak-system-only b/extra-repos/systemd/systemd-services/system-environment-generators-60-flatpak-system-only
new file mode 100644
index 000000000..e7ea28dc1
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/system-environment-generators-60-flatpak-system-only
@@ -0,0 +1,3 @@
+#!/bin/sh
+export GIO_USE_VFS=local
+exec flatpak --print-updated-env --print-system-only
diff --git a/extra-repos/systemd/systemd-services/tmpfiles.d-flatpak.conf b/extra-repos/systemd/systemd-services/tmpfiles.d-flatpak.conf
new file mode 100644
index 000000000..18081e7eb
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/tmpfiles.d-flatpak.conf
@@ -0,0 +1,2 @@
+# This is a systemd tmpfiles.d configuration file
+R! /var/tmp/flatpak-cache-*
diff --git a/extra-repos/systemd/systemd-services/user-environment-generators-60-flatpak b/extra-repos/systemd/systemd-services/user-environment-generators-60-flatpak
new file mode 100644
index 000000000..cccd9dfe8
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/user-environment-generators-60-flatpak
@@ -0,0 +1,3 @@
+#!/bin/sh
+export GIO_USE_VFS=local
+exec flatpak --print-updated-env