diff --git a/lorax_templates/scripts/post/configure_flatpak b/lorax_templates/scripts/post/configure_flatpak
new file mode 100644
index 0000000..6e76619
--- /dev/null
+++ b/lorax_templates/scripts/post/configure_flatpak
@@ -0,0 +1,11 @@
+<%page args="_flatpak_repo_gpg"/>
+
+if [[ -d /ostree/deploy/default/var/lib/flatpak/repo ]]
+then
+    echo ${_flatpak_repo_gpg} | base64 -d > /ostree/deploy/default/var/lib/flatpak/repo/flathub.trustedkeys.gpg
+elif [[ -d /var/lib/flatpak/repo ]]
+then
+    echo ${_flatpak_repo_gpg} | base64 -d > /var/lib/flatpak/repo/flathub.trustedkeys.gpg
+else
+    echo "Could not find Flatpaks repo
+fi
\ No newline at end of file
diff --git a/lorax_templates/set_flatpak_repo.tmpl.in b/lorax_templates/set_flatpak_repo.tmpl.in
index 9b0ad9c..3d4667f 100644
--- a/lorax_templates/set_flatpak_repo.tmpl.in
+++ b/lorax_templates/set_flatpak_repo.tmpl.in
@@ -1,5 +1,2 @@
 replace "flatpak_manager\.add_remote\(\"fedora\", \"oci\+https://registry\.fedoraproject\.org\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python3.12/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 replace "flatpak_manager\.replace_installed_refs_remote\(\"fedora\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python3.12/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail"
-append usr/share/anaconda/interactive-defaults.ks "echo ${_flatpak_repo_gpg} | base64 -d > /ostree/deploy/default/var/lib/flatpak/repo/flathub.trustedkeys.gpg"
-append usr/share/anaconda/interactive-defaults.ks "%end"