diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index 30992db..0d8db43 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -6,6 +6,3 @@ replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_rem
 replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 % endif
 
-%if flatpak_remote_name != 'fedora':
-systemctl disable flatpak-add-fedora-repos.service
-% endif
diff --git a/lorax_templates/scripts/post/flatpak_configure b/lorax_templates/scripts/post/flatpak_configure
index 1c54a7f..5331c05 100644
--- a/lorax_templates/scripts/post/flatpak_configure
+++ b/lorax_templates/scripts/post/flatpak_configure
@@ -1,4 +1,4 @@
-<%page args="_flatpak_repo_gpg"/>
+<%page args="_flatpak_repo_gpg, flatpak_remote_name"/>
 
 if [[ -d /ostree/deploy/default/var/lib/flatpak/repo ]]
 then
@@ -9,3 +9,8 @@ then
 else
     echo "Could not find Flatpaks repo"
 fi
+
+if [[ "${flatpak_remote_name}" != 'fedora' ]]
+then
+    systemctl disable flatpak-add-fedora-repos.service
+fi