diff --git a/playbooks/deploy-azure.yaml b/playbooks/deploy-azure.yaml
index 91e968c..216cc33 100644
--- a/playbooks/deploy-azure.yaml
+++ b/playbooks/deploy-azure.yaml
@@ -156,7 +156,7 @@
         az sig image-version list-community \
           --public-gallery-name fedora-5e266ba4-2250-406d-adad-5d73860d958f \
           --gallery-image-definition {{ fedora_community_gallery_image_name[test_os][arch] }} \
-          --location {{ location }} | jq -r '.[-1].uniqueId'
+          --location {{ location }} | jq -r '.[0].uniqueId'
       register: image_id_result
       when: "'fedora' in test_os"
 
diff --git a/tmt/plans/os-replace.fmf b/tmt/plans/os-replace.fmf
index 140e74e..2aa8eb6 100644
--- a/tmt/plans/os-replace.fmf
+++ b/tmt/plans/os-replace.fmf
@@ -150,3 +150,5 @@ execute:
   adjust+:
     - when: arch != x86_64 and arch != aarch64
       enabled: false
+    - when: distro == fedora
+      enabled: false