diff --git a/data/meson.build b/data/meson.build
index 93a4582..ca6d462 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -4,8 +4,19 @@ libexecdir_conf = configuration_data()
 libexecdir_conf.set('libexecdir', prefix / libexecdir)
 
 # Portal
+tau_portal_interfaces = [
+  'org.freedesktop.impl.portal.Settings',
+]
+tau_portal_conf = configuration_data()
+tau_portal_conf.set('PORTALS', ';'.join(tau_portal_interfaces))
+
 portal_dir = datadir / 'xdg-desktop-portal' / 'portals'
-install_data('tau.portal', install_dir: portal_dir)
+configure_file(
+  input: 'tau.portal.in',
+  output: 'tau.portal',
+  configuration: tau_portal_conf,
+  install_dir: portal_dir,
+)
 
 # Service
 configure_file(
diff --git a/data/org.freedesktop.impl.portal.desktop.tau.service.in b/data/org.freedesktop.impl.portal.desktop.tau.service.in
index 4f06e3d..a3df89e 100644
--- a/data/org.freedesktop.impl.portal.desktop.tau.service.in
+++ b/data/org.freedesktop.impl.portal.desktop.tau.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.impl.portal.desktop.tau
 Exec=@libexecdir@/xdg-desktop-portal-tau
-SystemdService=xdg-desktop-portal-tau.service
+SystemdService=xdg-desktop-portal-tau.service
\ No newline at end of file
diff --git a/data/tau.portal b/data/tau.portal
deleted file mode 100644
index 3257655..0000000
--- a/data/tau.portal
+++ /dev/null
@@ -1,4 +0,0 @@
-[portal]
-DBusName=org.freedesktop.impl.portal.desktop.tau
-Interfaces=org.freedesktop.impl.portal.Settings;
-UseIn=gtk;gnome;
diff --git a/data/tau.portal.in b/data/tau.portal.in
new file mode 100644
index 0000000..d3a1b6f
--- /dev/null
+++ b/data/tau.portal.in
@@ -0,0 +1,4 @@
+[portal]
+DBusName=org.freedesktop.impl.portal.desktop.tau
+Interfaces=@PORTALS@;
+UseIn=gnome;
diff --git a/data/xdg-desktop-portal-tau.desktop.in.in b/data/xdg-desktop-portal-tau.desktop.in.in
index c0c4606..d1b0785 100644
--- a/data/xdg-desktop-portal-tau.desktop.in.in
+++ b/data/xdg-desktop-portal-tau.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Portal
-# TRANSLATORS: Don't translate this text (this is icon name)
+Name=tauOS Portal
+# TRANSLATORS: Don't translate this text (this is the icon name)
 Icon=applications-system-symbolic
 Exec=@libexecdir@/xdg-desktop-portal-tau
-NoDisplay=true
+NoDisplay=true
\ No newline at end of file
diff --git a/data/xdg-desktop-portal-tau.service.in b/data/xdg-desktop-portal-tau.service.in
index d9bd858..8421005 100644
--- a/data/xdg-desktop-portal-tau.service.in
+++ b/data/xdg-desktop-portal-tau.service.in
@@ -1,7 +1,10 @@
 [Unit]
 Description=Portal service (tauOS implementation)
+After=graphical-session.target
+Requisite=graphical-session.target
+PartOf=graphical-session.target
 
 [Service]
 Type=dbus
 BusName=org.freedesktop.impl.portal.desktop.tau
-ExecStart=@libexecdir@/xdg-desktop-portal-tau
+ExecStart=@libexecdir@/xdg-desktop-portal-tau
\ No newline at end of file