diff --git a/dynamic-ugid-ownership-fixes.yaml b/dynamic-ugid-ownership-fixes.yaml
index 03b06b4..cfd9343 100644
--- a/dynamic-ugid-ownership-fixes.yaml
+++ b/dynamic-ugid-ownership-fixes.yaml
@@ -10,6 +10,4 @@ postprocess:
     Z /var/lib/passim - passim passim
     Z /var/log/passim - passim passim
     Z /etc/colord/    - colord colord
-    Z /var/lib/gnome-remote-desktop/ - gnome-remote-desktop gnome-remote-desktop
-    Z /etc/gnome-remote-desktop/     - gnome-remote-desktop gnome-remote-desktop
     EOF
diff --git a/silverblue-common.yaml b/silverblue-common.yaml
index 1404603..67aded5 100644
--- a/silverblue-common.yaml
+++ b/silverblue-common.yaml
@@ -48,3 +48,13 @@ postprocess:
     # Do not show the Third Party Software page
     skip=software
     EOF
+  # Selected ownership fixes for files in /etc & /var owned by a dynamic UID/GID
+  # See: https://gitlab.com/fedora/ostree/sig/-/issues/90
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+
+    cat > /usr/lib/tmpfiles.d/90-silverblue-ownership-fixes.conf << 'EOF'
+    Z /var/lib/gnome-remote-desktop/ - gnome-remote-desktop gnome-remote-desktop
+    Z /etc/gnome-remote-desktop/     - gnome-remote-desktop gnome-remote-desktop
+    EOF