diff --git a/image_resources/centos8-appstream.repo b/image_resources/centos8-appstream.repo
index c2067f100..a20e22a86 100644
--- a/image_resources/centos8-appstream.repo
+++ b/image_resources/centos8-appstream.repo
@@ -1,17 +1,17 @@
 [centos8-appstream-x86_64]
 name=CentOS-8-Appstream-x86_64
-baseurl=http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/
+baseurl=http://vault.centos.org/centos/8-stream/AppStream/x86_64/os/
 enabled=0
 gpgcheck=0
 
 [centos8-appstream-aarch64]
 name=CentOS-8-Appstream-aarch64
-baseurl=http://mirror.centos.org/centos/8-stream/AppStream/aarch64/os/
+baseurl=http://vault.centos.org/centos/8-stream/AppStream/aarch64/os/
 enabled=0
 gpgcheck=0
 
 [centos8-appstream-ppc64le]
 name=CentOS-8-Appstream-ppc64le
-baseurl=http://mirror.centos.org/centos/8-stream/AppStream/ppc64le/os/
+baseurl=http://vault.centos.org/centos/8-stream/AppStream/ppc64le/os/
 enabled=0
 gpgcheck=0
diff --git a/roles/fio_distributed/tasks/main.yml b/roles/fio_distributed/tasks/main.yml
index db63d2195..e9913a007 100644
--- a/roles/fio_distributed/tasks/main.yml
+++ b/roles/fio_distributed/tasks/main.yml
@@ -93,7 +93,7 @@
   - name: Capture pod list
     k8s_info:
       kind: VirtualMachineInstance
-      api_version: kubevirt.io/v1alpha3
+      api_version: kubevirt.io/v1
       namespace: '{{ operator_namespace }}'
       label_selectors:
         - app = fio-benchmark-{{ trunc_uuid }}
@@ -110,6 +110,7 @@
     set_fact:
       pod_details: "{{ pod_details|default({}) | combine({item.status.interfaces[0].ipAddress: item.status.nodeName}) }}"
     with_items: "{{ server_pods.resources }}"
+    when: benchmark_state.resources[0].status.state == "StartingClient"
 
   when: (workload.args.kind | default('pod')) == "vm"
 
diff --git a/roles/fio_distributed/templates/server_vm.yml.j2 b/roles/fio_distributed/templates/server_vm.yml.j2
index 7fe34ee96..8d42170b1 100644
--- a/roles/fio_distributed/templates/server_vm.yml.j2
+++ b/roles/fio_distributed/templates/server_vm.yml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: kubevirt.io/v1alpha3
+apiVersion: kubevirt.io/v1
 kind: VirtualMachineInstance
 metadata:
   name: 'fio-server-{{item | string}}-{{ trunc_uuid }}'