diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index f4411365a..2b4c11f05 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=36
+pkgver=37
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -93,8 +93,9 @@ _evolution_data_server_sources="
 " # 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-oci-authenticator.service
 	user/flatpak-portal.service
+	user/flatpak-session-helper.service
 	system-environment-generators/60-flatpak-system-only
 	user-environment-generators/60-flatpak
 	tmpfiles.d/flatpak.conf
@@ -314,8 +315,9 @@ c648760e50e0c47970cce8fdd1972864af74bbc979ed4366973bf1c923ee624779bea95cf1e54260
 0e5d1d1cd0e7c9942dcc0c0742beb85f0c1c61338f0b637835f347579601ff7fe93214041306b69db2162aafb677a1d7111130c0f7dab646e5b5cd9f2dda3b33  user-evolution-source-registry.service
 fda84bb8dc10fa613790ff3ac9d50a03f21fb32f793ba3641740be93136800f0f07ba53d6e4843d0912f802955cc26719333d1dc2877610eff12354e8538ad5b  user-evolution-user-prompter.service
 fe2fd936cafc22a1bea7c4c0d9135866395cf537fc7a030350ef7ea427a8d3dd658fb608974c67d224c7471a8ccb7d621d12c4df5eb5c421c5de2f22bf22dd64  system-flatpak-system-helper.service
-815a3072c211c85ff475ac7f2fb9c280b567b98777c0f7bf7fea4575b5eaa3b9a4003a08eb3b8cb5b2d7f9fb6525e04491e8d87013e2539ae3a574db647f97b1  user-flatpak-session-helper.service
-7a17986c0f0554f0b27a5933b3e04657323edb23047878616727863fdc748cb8d8fea978f43895341037e2d1512bbd492bdbc19c40419cd3e109345614645388  user-flatpak-portal.service
+c4dcaa578bbe9e0023cff139a6857a0df28fb81c9814577348e9996122945e26f8ec2760189a312ba46b14a6553afe12af8acd6fc77ea534ff2a632b2e2c2043  user-flatpak-oci-authenticator.service
+31c13c8774d35dc22c153787488b7764b0585f904f555ab578deba1fc18704080694dffd2794b4bf69f07cadeaf63ed5f384c97129ccce4962a59defd331899f  user-flatpak-portal.service
+f73df99518af1fd13f96342f561d43b69ebf757cdfd4444cee61665d5bfaa715c5be458cb44feb4a15e5d5613a91dec9e971a7bca30d2ae880d9e10eb7405ead  user-flatpak-session-helper.service
 62be7a7a7dce425fe8155f92ceab57aea52542687d27a2ce3cd9da0a80672381361fb3e4a8d58caf9cc02d80824a29e161ffb9f065f640b4481704851eb0378a  system-environment-generators-60-flatpak-system-only
 2d1337da0d1ac7ea5d6ffefbe05621970fef491278028589f5095ee6072867977eca7a68a997d6870e450546c2077d999207fadb568ab611833769555bfb5c64  user-environment-generators-60-flatpak
 ae2d20da95e519041f6eca39dd140895b2c46284f0894c60a29cf56b87704805146ddc2435e46e7fffbfc8bcab2cabceb32a10804ba1b648e2ed041c0b056102  tmpfiles.d-flatpak.conf
diff --git a/extra-repos/systemd/systemd-services/user-flatpak-oci-authenticator.service b/extra-repos/systemd/systemd-services/user-flatpak-oci-authenticator.service
new file mode 100644
index 000000000..efb3a1d9f
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/user-flatpak-oci-authenticator.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=flatpak oci authenticator
+
+[Service]
+BusName=org.flatpak.Authenticator.Oci
+ExecStart=/usr/libexec/flatpak-oci-authenticator
+Type=dbus
diff --git a/extra-repos/systemd/systemd-services/user-flatpak-portal.service b/extra-repos/systemd/systemd-services/user-flatpak-portal.service
index caebeac2c..5c72ec0de 100644
--- a/extra-repos/systemd/systemd-services/user-flatpak-portal.service
+++ b/extra-repos/systemd/systemd-services/user-flatpak-portal.service
@@ -4,5 +4,5 @@ PartOf=graphical-session.target
 
 [Service]
 BusName=org.freedesktop.portal.Flatpak
-ExecStart=/usr/lib/flatpak/flatpak-portal
+ExecStart=/usr/libexec/flatpak-portal
 Type=dbus
diff --git a/extra-repos/systemd/systemd-services/user-flatpak-session-helper.service b/extra-repos/systemd/systemd-services/user-flatpak-session-helper.service
index 715244e26..d268b286c 100644
--- a/extra-repos/systemd/systemd-services/user-flatpak-session-helper.service
+++ b/extra-repos/systemd/systemd-services/user-flatpak-session-helper.service
@@ -4,5 +4,5 @@ PartOf=graphical-session.target
 
 [Service]
 BusName=org.freedesktop.Flatpak
-ExecStart=/usr/lib/flatpak/flatpak-session-helper
+ExecStart=/usr/libexec/flatpak-session-helper
 Type=dbus