diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 17fa4c1..e5b3ad3 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -12,7 +12,7 @@ on:
               "39", 
               "40",
               "41"
-            ], 
+            ],
             "flatpaks": [
               "false",
               "flatpak_refs_dir",
diff --git a/test/iso/flatpak_repo_updated.sh b/test/iso/flatpak_repo_updated.sh
index 68a07c4..46f33d1 100644
--- a/test/iso/flatpak_repo_updated.sh
+++ b/test/iso/flatpak_repo_updated.sh
@@ -2,8 +2,16 @@
 
 if [[ ${VERSION} -ge 41 ]]
 then
-    grep "${_FLATPAK_REPO_URL}" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null
-    exit $?
+    result=0
+    grep "^[Payload]" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null || {
+        echo "Missing [Payload] header"
+        result=1
+    }
+    grep "^flatpak_remote = ${FLATPAK_REMOTE_NAME} ${_FLATPAK_REPO_URL}" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null || {
+        echo "Missing flatpak_remote option"
+        result=1
+    }
+    exit ${result}
 fi
 
 add_line=$(grep flatpak_manager.add_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
diff --git a/test/vm/flatpak_fedora_repo_disabled.yml b/test/vm/flatpak_fedora_repo_disabled.yml
index dfb6c7d..aacfc09 100644
--- a/test/vm/flatpak_fedora_repo_disabled.yml
+++ b/test/vm/flatpak_fedora_repo_disabled.yml
@@ -14,4 +14,5 @@
     ansible.builtin.assert:
       that:
         - services_state['ansible_facts']['services']['flatpak-add-fedora-repos.service']['status'] == 'disabled'
-      fail_msg: 'flatpak-add-fedora-repos.service is not disabled'
\ No newline at end of file
+      fail_msg: 'flatpak-add-fedora-repos.service is not disabled'
+      success_msg: 'flatpak-add-fedora-repos.service is correctly disabled'
\ No newline at end of file