diff --git a/collection/stages/roles/verification/tasks/check_registry.yml b/collection/stages/roles/verification/tasks/check_registry.yml
index f1f32f4a..f223c51d 100644
--- a/collection/stages/roles/verification/tasks/check_registry.yml
+++ b/collection/stages/roles/verification/tasks/check_registry.yml
@@ -111,7 +111,7 @@
     - name: Get the images objects in swift for the {{ swift_check_ns }} namespace from the containers
       ansible.builtin.shell: |
         set -o pipefail
-        target="{{ swift_check_ns }}.{{ swift_check_image }}"
+        target="{{ swift_check_ns }}/{{ swift_check_image }}"
         openstack container list -f json \
           | jq -r '.[] | (.Name // .name // empty)' \
           | while read -r container; do
diff --git a/collection/stages/roles/verification/tasks/main.yml b/collection/stages/roles/verification/tasks/main.yml
index 394f8120..9916d645 100644
--- a/collection/stages/roles/verification/tasks/main.yml
+++ b/collection/stages/roles/verification/tasks/main.yml
@@ -133,7 +133,9 @@
       when:
         - not _skip_health
         - installation_type != 'upi'
-        - manila_enabled.rc == 0
+        # catalog show -f json returns rc=0 and "{}" when the service is missing
+        # (PR #32). Ansible when lists are not short-circuit; default empty JSON.
+        - manila_enabled.rc == 0 and ((manila_enabled.stdout | default('{}', true) | from_json | length) > 0)
         - ceph_nfs_ready|default(true)|bool
         - edge_nova_az is not defined # Skip due to Openstack Manila is not supported at the Edge
         - not openshift_proxy_installation|default(false)|bool