diff --git a/roles/flatpak/defaults/main.yml b/roles/flatpak/defaults/main.yml
index fd395ba..7bfdacd 100644
--- a/roles/flatpak/defaults/main.yml
+++ b/roles/flatpak/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
 flatpak_configure_remotes: true
 flatpak_alter_flatpaks: true
-flatpak_automatic_updates: true
+flatpak_automatic_updates: true
\ No newline at end of file
diff --git a/roles/flatpak/files/flatpak-automatic.service b/roles/flatpak/files/flatpak-automatic.service
deleted file mode 100644
index 5bcf03f..0000000
--- a/roles/flatpak/files/flatpak-automatic.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=flatpak Automatic Update
-Documentation=man:flatpak(1)
-
-[Service]
-Type=simple
-ExecStartPre=/bin/sh -c 'until ping -c1 google.com; do sleep 5; done;'
-ExecStart=/usr/bin/flatpak update -y
diff --git a/roles/flatpak/tasks/main.yml b/roles/flatpak/tasks/main.yml
index 4b26731..daafdba 100644
--- a/roles/flatpak/tasks/main.yml
+++ b/roles/flatpak/tasks/main.yml
@@ -7,17 +7,18 @@
   ansible.builtin.include: flatpaks.yml
   when: flatpak_alter_flatpaks | bool
 
+# https://github.com/flatpak/flatpak/issues/3847#issuecomment-818532856
 - name: Enable flatpak Automatic Update
-  ansible.builtin.copy:
+  ansible.builtin.template:
     src: "{{ item }}"
-    dest: "/etc/systemd/system/{{ item }}"
+    dest: "/etc/systemd/system/{{ item | regex_replace('.j2', '') }}"
     owner: root
     group: root
     mode: '0644'
   become: yes
   with_items:
-    - flatpak-automatic.service
-    - flatpak-automatic.timer
+    - flatpak-automatic.service.j2
+    - flatpak-automatic.timer.j2
   notify:
     - Enable flatpak-automatic
   when: flatpak_automatic_updates | bool
diff --git a/roles/flatpak/templates/flatpak-automatic.service.j2 b/roles/flatpak/templates/flatpak-automatic.service.j2
new file mode 100644
index 0000000..b00d1cb
--- /dev/null
+++ b/roles/flatpak/templates/flatpak-automatic.service.j2
@@ -0,0 +1,10 @@
+[Unit]
+Description=flatpak Automatic Update
+Documentation=man:flatpak(1)
+
+[Service]
+Environment='DISPLAY={{ ansible_facts["env"]["DISPLAY"] }}'
+Environment='DBUS_SESSION_BUS_ADDRESS={{ ansible_facts["env"]["DBUS_SESSION_BUS_ADDRESS"] }}'
+Type=simple
+ExecStartPre=nm-online
+ExecStart=/usr/bin/flatpak update -y
diff --git a/roles/flatpak/files/flatpak-automatic.timer b/roles/flatpak/templates/flatpak-automatic.timer.j2
similarity index 100%
rename from roles/flatpak/files/flatpak-automatic.timer
rename to roles/flatpak/templates/flatpak-automatic.timer.j2