diff --git a/test/vmtests/vmtests/imagecustomizer/test_min_change.py b/test/vmtests/vmtests/imagecustomizer/test_min_change.py
index e956f972ff..346d6a187f 100644
--- a/test/vmtests/vmtests/imagecustomizer/test_min_change.py
+++ b/test/vmtests/vmtests/imagecustomizer/test_min_change.py
@@ -208,10 +208,7 @@ def test_min_change_efi_azl3_qcow_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 3
-    if platform.machine() == "x86_64":
-        config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-amd64-azl3.yaml")
-    else:
-        config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-arm64-azl3.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-azl3.yaml")
     output_format = "qcow2"
 
     run_min_change_test(
@@ -242,10 +239,7 @@ def test_min_change_efi_azl4_qcow_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 4
-    if platform.machine() == "x86_64":
-        config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-amd64-azl4.yaml")
-    else:
-        config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-arm64-azl4.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-azl4.yaml")
     output_format = "qcow2"
 
     run_min_change_test(
@@ -309,7 +303,7 @@ def test_min_change_legacy_azl3_qcow_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 3
-    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-amd64-azl3.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-azl3.yaml")
     output_format = "qcow2"
 
     run_min_change_test(
@@ -341,7 +335,7 @@ def test_min_change_legacy_azl4_qcow_output(
     close_list: List[Closeable],
 ) -> None:
     azl_release = 4
-    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-amd64-azl4.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("os-vm-config-azl4.yaml")
     output_format = "qcow2"
 
     run_min_change_test(
diff --git a/test/vmtests/vmtests/osmodifier/test_osmodifier.py b/test/vmtests/vmtests/osmodifier/test_osmodifier.py
index b8192d696b..cdf7e6827e 100644
--- a/test/vmtests/vmtests/osmodifier/test_osmodifier.py
+++ b/test/vmtests/vmtests/osmodifier/test_osmodifier.py
@@ -3,7 +3,6 @@
 
 import logging
 import os
-import platform
 import tempfile
 from pathlib import Path
 from typing import List, Tuple
@@ -37,10 +36,7 @@ def setup_vm_with_osmodifier(
     libvirt_conn: libvirt.virConnect,
     session_close_list: List[Closeable],
 ) -> Tuple[SshClient, Path, Path]:
-    if platform.machine() == "x86_64":
-        config_path = TEST_CONFIGS_DIR.joinpath("osmodifier-vm-config.yaml")
-    else:
-        config_path = TEST_CONFIGS_DIR.joinpath("osmodifier-vm-config-arm64.yaml")
+    config_path = TEST_CONFIGS_DIR.joinpath("osmodifier-vm-config.yaml")
 
     output_format = "qcow2"
     ssh_public_key, ssh_private_key_path = ssh_key
diff --git a/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-arm64-azl3.yaml b/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-arm64-azl3.yaml
deleted file mode 100644
index c250ffc5ab..0000000000
--- a/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-arm64-azl3.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-os:
-  additionalFiles:
-    # Enable DHCP client on all of the physical NICs.
-  - source: files/89-ethernet.network
-    destination: /etc/systemd/network/89-ethernet.network
-  packages:
-    install:
-    - dracut-virtio
-    # multi-kernel test
-    - kernel-6.6.57.1-6.azl3
diff --git a/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-arm64-azl4.yaml b/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-arm64-azl4.yaml
deleted file mode 100644
index d131e07a99..0000000000
--- a/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-arm64-azl4.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Differs from os-vm-config-arm64-azl3 in the kernel version
-os:
-  additionalFiles:
-    # Enable DHCP client on all of the physical NICs.
-  - source: files/89-ethernet.network
-    destination: /etc/systemd/network/89-ethernet.network
-  packages:
-    install:
-    - dracut-virtio
-    # multi-kernel test
-    - kernel-6.18.5-1.8.azl4~20260420
diff --git a/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-amd64-azl3.yaml b/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-azl3.yaml
similarity index 100%
rename from toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-amd64-azl3.yaml
rename to toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-azl3.yaml
diff --git a/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-amd64-azl4.yaml b/toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-azl4.yaml
similarity index 100%
rename from toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-amd64-azl4.yaml
rename to toolkit/tools/pkg/imagecustomizerlib/testdata/os-vm-config-azl4.yaml
diff --git a/toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config.yaml b/toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config-azl3.yaml
similarity index 100%
rename from toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config.yaml
rename to toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config-azl3.yaml
diff --git a/toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config-arm64.yaml b/toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config-azl4.yaml
similarity index 77%
rename from toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config-arm64.yaml
rename to toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config-azl4.yaml
index 0056cfe335..88f2a0f20e 100644
--- a/toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config-arm64.yaml
+++ b/toolkit/tools/pkg/imagecustomizerlib/testdata/osmodifier-vm-config-azl4.yaml
@@ -1,14 +1,11 @@
+# Differs from osmodifier-vm-config-azl3 its removal of selinux-policy-modules
 os:
   additionalFiles:
     # Enable DHCP client on all of the physical NICs.
   - source: files/89-ethernet.network
     destination: /etc/systemd/network/89-ethernet.network
-  packages:
-    install:
-    - dracut-virtio
   packages:
     install:
     - selinux-policy
-    - selinux-policy-modules
     - setools-console
     - policycoreutils-python-utils