diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 3deab01e99..c1d5245446 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -24,6 +24,7 @@ excluded_pairs:
   # e.g. - ['ubuntu-1804-lts', 'core_bpf']
   # This can be removed once we have downloadable s390x eBPF drivers
   - [ 'rhel-8-6-s390x', 'ebpf' ]
+  # Also exclude Power & core_bpf, since it is currently unsupported
   - [ 'p', 'core_bpf' ]
 
 virtual_machines:
@@ -37,9 +38,9 @@ virtual_machines:
     project: rhel-s390x-cloud
     families:
       - rhel-8-6-s390x
-  
-  #We have taken families name as "p" since there is a character limit for instance name  
-  #in ibm cloud(56 chars max)
+
+  # We have taken families name as "p" since there is a character limit for instance name
+  # in ibm cloud (56 chars max)
   rhel-ppc64le:
     project: rhel-ppc64le-cloud
     families:
@@ -109,15 +110,3 @@ virtual_machines:
     project: sap-se-gcp-gardenlinux
     images:
       - "{{ lookup('file', 'group_vars/gardenlinux-image.txt') }}"
-
-
-# IBM Cloud setup
-# vpc_name: lei-vpc-toronto
-vpc_id: r038-c4f8e233-4b56-44bd-af71-140ebd1664e9
-# subnet_name: stackrox-ci-sn3
-subnet_id: 02s7-0fca7f4f-7e53-40d5-a087-f8cb5d7ab682
-zone: ca-tor-3
-# ssh_key_name: acs-sshkey
-ssh_key_id: r038-fb0260c7-c01d-45c8-8026-7d50042943b9
-# vsi_resource_group: stackrox-ci-resource-group
-vsi_resource_group_id: 1a33a6a9bd6e498f8115e9b1064bfa97
diff --git a/ansible/roles/create-vm/tasks/create-s390x-vm.yml b/ansible/roles/create-vm/tasks/create-s390x-vm.yml
index 126d5d33c3..4d7626f3e4 100644
--- a/ansible/roles/create-vm/tasks/create-s390x-vm.yml
+++ b/ansible/roles/create-vm/tasks/create-s390x-vm.yml
@@ -15,15 +15,15 @@
     name: "{{ vsi_name }}"
     state: available
     id: "{{ vsi.resource.id | default(omit) }}"
-    vpc: "{{ vpc_id }}"
-    profile: "{{ vsi_profile }}"
-    image: "{{ vsi_image_id }}"
-    resource_group: "{{ vsi_resource_group_id }}"
+    vpc: "{{ s390x.vpc_id }}"
+    profile: "{{ s390x.vsi_profile }}"
+    image: "{{ s390x.vsi_image_id }}"
+    resource_group: "{{ s390x.vsi_resource_group_id }}"
     keys:
-      - "{{ ssh_key_id }}"
+      - "{{ s390x.ssh_key_id }}"
     primary_network_interface:
-     - subnet: "{{ subnet_id }}"
-    zone: "{{ zone }}"
+     - subnet: "{{ s390x.subnet_id }}"
+    zone: "{{ s390x.zone }}"
   register: vsi
 
 - name: Check for existing Floating IP
@@ -39,7 +39,7 @@
     name: "{{ vsi_name }}-fip"
     state: available
     id: "{{ fip.resource.id | default(omit) }}"
-    resource_group: "{{ vsi_resource_group_id }}"
+    resource_group: "{{ s390x.vsi_resource_group_id }}"
     target: "{{ vsi.resource.primary_network_interface[0]['id'] }}"
   register: fip
 
diff --git a/ansible/roles/create-vm/vars/s390x.yml b/ansible/roles/create-vm/vars/s390x.yml
index d9dc02fea5..0376433392 100644
--- a/ansible/roles/create-vm/vars/s390x.yml
+++ b/ansible/roles/create-vm/vars/s390x.yml
@@ -1,4 +1,17 @@
 ---
-#rhel-8-6-s390x
-vsi_image_id: r038-0d89bf54-c28f-4dc4-bec0-0f8e03a74de3
-vsi_profile: bz2-2x8
\ No newline at end of file
+
+s390x:
+  #rhel-8-6-s390x
+  vsi_image_id: r038-0d89bf54-c28f-4dc4-bec0-0f8e03a74de3
+  vsi_profile: bz2-2x8
+
+  # IBM Cloud setup
+  # vpc_name: lei-vpc-toronto
+  vpc_id: r038-c4f8e233-4b56-44bd-af71-140ebd1664e9
+  # subnet_name: stackrox-ci-sn3
+  subnet_id: 02s7-0fca7f4f-7e53-40d5-a087-f8cb5d7ab682
+  zone: ca-tor-3
+  # ssh_key_name: acs-sshkey
+  ssh_key_id: r038-fb0260c7-c01d-45c8-8026-7d50042943b9
+  # vsi_resource_group: stackrox-ci-resource-group
+  vsi_resource_group_id: 1a33a6a9bd6e498f8115e9b1064bfa97