diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 7daed5cb124..e590812264c 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -392,56 +392,56 @@ stages:
             - 2
             - 3
 
-### Cloud
-  - stage: Cloud_devel
-    displayName: Cloud devel
+### Generic
+  - stage: Generic_devel
+    displayName: Generic devel
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: devel/cloud/{0}/1
+          testFormat: devel/generic/{0}/1
           targets:
             - test: 2.7
             - test: '3.11'
-  - stage: Cloud_2_14
-    displayName: Cloud 2.14
+  - stage: Generic_2_14
+    displayName: Generic 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.14/cloud/{0}/1
+          testFormat: 2.14/generic/{0}/1
           targets:
             - test: '3.10'
-  - stage: Cloud_2_13
-    displayName: Cloud 2.13
+  - stage: Generic_2_13
+    displayName: Generic 2.13
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.13/cloud/{0}/1
+          testFormat: 2.13/generic/{0}/1
           targets:
             - test: 3.9
-  - stage: Cloud_2_12
-    displayName: Cloud 2.12
+  - stage: Generic_2_12
+    displayName: Generic 2.12
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.12/cloud/{0}/1
+          testFormat: 2.12/generic/{0}/1
           targets:
             - test: 3.8
-  - stage: Cloud_2_11
-    displayName: Cloud 2.11
+  - stage: Generic_2_11
+    displayName: Generic 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.11/cloud/{0}/1
+          testFormat: 2.11/generic/{0}/1
           targets:
             - test: 2.7
             - test: 3.5
@@ -470,10 +470,10 @@ stages:
       - Docker_2_13
       - Docker_2_14
       - Docker_community_devel
-      - Cloud_devel
-      - Cloud_2_11
-      - Cloud_2_12
-      - Cloud_2_13
-      - Cloud_2_14
+      - Generic_devel
+      - Generic_2_11
+      - Generic_2_12
+      - Generic_2_13
+      - Generic_2_14
     jobs:
       - template: templates/coverage.yml
diff --git a/tests/integration/targets/alerta_customer/aliases b/tests/integration/targets/alerta_customer/aliases
index 1a0d20b0b2d..d163e8d9ca9 100644
--- a/tests/integration/targets/alerta_customer/aliases
+++ b/tests/integration/targets/alerta_customer/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 disabled
diff --git a/tests/integration/targets/alternatives/aliases b/tests/integration/targets/alternatives/aliases
index d281365a463..f360ac626af 100644
--- a/tests/integration/targets/alternatives/aliases
+++ b/tests/integration/targets/alternatives/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 needs/root
 skip/aix
diff --git a/tests/integration/targets/ansible_galaxy_install/aliases b/tests/integration/targets/ansible_galaxy_install/aliases
index de4a0e413a5..13655b1945e 100644
--- a/tests/integration/targets/ansible_galaxy_install/aliases
+++ b/tests/integration/targets/ansible_galaxy_install/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/python2.6
 context/controller  # While this is not really true, this module mainly is run on the controller, *and* needs access to the ansible-galaxy CLI tool
diff --git a/tests/integration/targets/apache2_module/aliases b/tests/integration/targets/apache2_module/aliases
index 64596c2b128..0d1324b22a3 100644
--- a/tests/integration/targets/apache2_module/aliases
+++ b/tests/integration/targets/apache2_module/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/aix
diff --git a/tests/integration/targets/archive/aliases b/tests/integration/targets/archive/aliases
index 421f918a394..88b15a24f33 100644
--- a/tests/integration/targets/archive/aliases
+++ b/tests/integration/targets/archive/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 needs/root
-shippable/posix/group2
 destructive
 skip/aix
 skip/osx  # FIXME
diff --git a/tests/integration/targets/callback_diy/aliases b/tests/integration/targets/callback_diy/aliases
index c0ba6c52309..3e2dd244c18 100644
--- a/tests/integration/targets/callback_diy/aliases
+++ b/tests/integration/targets/callback_diy/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 needs/target/callback
diff --git a/tests/integration/targets/callback_log_plays/aliases b/tests/integration/targets/callback_log_plays/aliases
index 7a0fc5c1eac..343f119da8e 100644
--- a/tests/integration/targets/callback_log_plays/aliases
+++ b/tests/integration/targets/callback_log_plays/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
diff --git a/tests/integration/targets/callback_yaml/aliases b/tests/integration/targets/callback_yaml/aliases
index 56b63416e24..a27cf0e26fa 100644
--- a/tests/integration/targets/callback_yaml/aliases
+++ b/tests/integration/targets/callback_yaml/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/target/callback
diff --git a/tests/integration/targets/cargo/aliases b/tests/integration/targets/cargo/aliases
index 190289e1176..9c7febe2411 100644
--- a/tests/integration/targets/cargo/aliases
+++ b/tests/integration/targets/cargo/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 destructive
-shippable/posix/group2
 skip/aix
diff --git a/tests/integration/targets/cloud_init_data_facts/aliases b/tests/integration/targets/cloud_init_data_facts/aliases
index ce552edd9cf..bec4d21af69 100644
--- a/tests/integration/targets/cloud_init_data_facts/aliases
+++ b/tests/integration/targets/cloud_init_data_facts/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/cmd_runner/aliases b/tests/integration/targets/cmd_runner/aliases
index be75e3ddabe..12d1d6617eb 100644
--- a/tests/integration/targets/cmd_runner/aliases
+++ b/tests/integration/targets/cmd_runner/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/connection_chroot/aliases b/tests/integration/targets/connection_chroot/aliases
index 847f93469ac..38138ee4d83 100644
--- a/tests/integration/targets/connection_chroot/aliases
+++ b/tests/integration/targets/connection_chroot/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 needs/root
-shippable/posix/group3
 skip/macos # Skipped due to limitation of macOS 10.15 SIP, please read https://github.com/ansible-collections/community.general/issues/1017#issuecomment-755088895
diff --git a/tests/integration/targets/consul/aliases b/tests/integration/targets/consul/aliases
index 3b6b148f7eb..d9cf1eb9ce1 100644
--- a/tests/integration/targets/consul/aliases
+++ b/tests/integration/targets/consul/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 destructive
 skip/aix
 skip/macos  # cannot simply create binaries in system locations on newer macOS versions
diff --git a/tests/integration/targets/copr/aliases b/tests/integration/targets/copr/aliases
index 836e186b55c..ed3c1af00d6 100644
--- a/tests/integration/targets/copr/aliases
+++ b/tests/integration/targets/copr/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/root
 skip/macos
 skip/osx
diff --git a/tests/integration/targets/cpanm/aliases b/tests/integration/targets/cpanm/aliases
index 73181a86212..d30ba06b69b 100644
--- a/tests/integration/targets/cpanm/aliases
+++ b/tests/integration/targets/cpanm/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 skip/macos
 skip/osx
diff --git a/tests/integration/targets/cronvar/aliases b/tests/integration/targets/cronvar/aliases
index 77e5c4afa2f..e9ef7265dc2 100644
--- a/tests/integration/targets/cronvar/aliases
+++ b/tests/integration/targets/cronvar/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/deploy_helper/aliases b/tests/integration/targets/deploy_helper/aliases
index abc0d5476d7..afda346c4ed 100644
--- a/tests/integration/targets/deploy_helper/aliases
+++ b/tests/integration/targets/deploy_helper/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
diff --git a/tests/integration/targets/django_manage/aliases b/tests/integration/targets/django_manage/aliases
index 0e2bbfeb8e0..025fe0ec487 100644
--- a/tests/integration/targets/django_manage/aliases
+++ b/tests/integration/targets/django_manage/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2
 skip/freebsd
 skip/macos
diff --git a/tests/integration/targets/dnf_versionlock/aliases b/tests/integration/targets/dnf_versionlock/aliases
index 3cde3b17152..b85ae641905 100644
--- a/tests/integration/targets/dnf_versionlock/aliases
+++ b/tests/integration/targets/dnf_versionlock/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/dpkg_divert/aliases b/tests/integration/targets/dpkg_divert/aliases
index 39a9de2b1b5..050bf89b4a6 100644
--- a/tests/integration/targets/dpkg_divert/aliases
+++ b/tests/integration/targets/dpkg_divert/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/etcd3/aliases b/tests/integration/targets/etcd3/aliases
index b8da295be8c..264446580b2 100644
--- a/tests/integration/targets/etcd3/aliases
+++ b/tests/integration/targets/etcd3/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 destructive
 skip/aix
 skip/osx
diff --git a/tests/integration/targets/filesize/aliases b/tests/integration/targets/filesize/aliases
index abc0d5476d7..afda346c4ed 100644
--- a/tests/integration/targets/filesize/aliases
+++ b/tests/integration/targets/filesize/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
diff --git a/tests/integration/targets/filesystem/aliases b/tests/integration/targets/filesystem/aliases
index 86d2291bb51..007bed5386b 100644
--- a/tests/integration/targets/filesystem/aliases
+++ b/tests/integration/targets/filesystem/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/filter_counter/aliases b/tests/integration/targets/filter_counter/aliases
index d3b8ee2b84a..bc9b4bc99b8 100644
--- a/tests/integration/targets/filter_counter/aliases
+++ b/tests/integration/targets/filter_counter/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_dict/aliases b/tests/integration/targets/filter_dict/aliases
index 2ae66ec51c7..e8051e04278 100644
--- a/tests/integration/targets/filter_dict/aliases
+++ b/tests/integration/targets/filter_dict/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_dict_kv/aliases b/tests/integration/targets/filter_dict_kv/aliases
index d3b8ee2b84a..bc9b4bc99b8 100644
--- a/tests/integration/targets/filter_dict_kv/aliases
+++ b/tests/integration/targets/filter_dict_kv/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_from_csv/aliases b/tests/integration/targets/filter_from_csv/aliases
index d3b8ee2b84a..bc9b4bc99b8 100644
--- a/tests/integration/targets/filter_from_csv/aliases
+++ b/tests/integration/targets/filter_from_csv/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_groupby_as_dict/aliases b/tests/integration/targets/filter_groupby_as_dict/aliases
index 2ae66ec51c7..e8051e04278 100644
--- a/tests/integration/targets/filter_groupby_as_dict/aliases
+++ b/tests/integration/targets/filter_groupby_as_dict/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_hashids/aliases b/tests/integration/targets/filter_hashids/aliases
index d3b8ee2b84a..bc9b4bc99b8 100644
--- a/tests/integration/targets/filter_hashids/aliases
+++ b/tests/integration/targets/filter_hashids/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_jc/aliases b/tests/integration/targets/filter_jc/aliases
index 49b40f054d3..0e799090e83 100644
--- a/tests/integration/targets/filter_jc/aliases
+++ b/tests/integration/targets/filter_jc/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
 skip/python2.7  # jc only supports python3.x
diff --git a/tests/integration/targets/filter_json_query/aliases b/tests/integration/targets/filter_json_query/aliases
index 08d571c4959..cee9abd2ce1 100644
--- a/tests/integration/targets/filter_json_query/aliases
+++ b/tests/integration/targets/filter_json_query/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
 skip/aix
diff --git a/tests/integration/targets/filter_lists_mergeby/aliases b/tests/integration/targets/filter_lists_mergeby/aliases
index d3b8ee2b84a..bc9b4bc99b8 100644
--- a/tests/integration/targets/filter_lists_mergeby/aliases
+++ b/tests/integration/targets/filter_lists_mergeby/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_path_join_shim/aliases b/tests/integration/targets/filter_path_join_shim/aliases
index b7419a24dd9..51baa3d7add 100644
--- a/tests/integration/targets/filter_path_join_shim/aliases
+++ b/tests/integration/targets/filter_path_join_shim/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_random_mac/aliases b/tests/integration/targets/filter_random_mac/aliases
index 08d571c4959..cee9abd2ce1 100644
--- a/tests/integration/targets/filter_random_mac/aliases
+++ b/tests/integration/targets/filter_random_mac/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
 skip/aix
diff --git a/tests/integration/targets/filter_time/aliases b/tests/integration/targets/filter_time/aliases
index d3b8ee2b84a..bc9b4bc99b8 100644
--- a/tests/integration/targets/filter_time/aliases
+++ b/tests/integration/targets/filter_time/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_unicode_normalize/aliases b/tests/integration/targets/filter_unicode_normalize/aliases
index d3b8ee2b84a..bc9b4bc99b8 100644
--- a/tests/integration/targets/filter_unicode_normalize/aliases
+++ b/tests/integration/targets/filter_unicode_normalize/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_version_sort/aliases b/tests/integration/targets/filter_version_sort/aliases
index d3b8ee2b84a..bc9b4bc99b8 100644
--- a/tests/integration/targets/filter_version_sort/aliases
+++ b/tests/integration/targets/filter_version_sort/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/flatpak/aliases b/tests/integration/targets/flatpak/aliases
index 3ac02679538..e462ed8cb66 100644
--- a/tests/integration/targets/flatpak/aliases
+++ b/tests/integration/targets/flatpak/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 skip/aix
 skip/freebsd
diff --git a/tests/integration/targets/flatpak_remote/aliases b/tests/integration/targets/flatpak_remote/aliases
index 3ac02679538..e462ed8cb66 100644
--- a/tests/integration/targets/flatpak_remote/aliases
+++ b/tests/integration/targets/flatpak_remote/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 skip/aix
 skip/freebsd
diff --git a/tests/integration/targets/gem/aliases b/tests/integration/targets/gem/aliases
index 86d2291bb51..007bed5386b 100644
--- a/tests/integration/targets/gem/aliases
+++ b/tests/integration/targets/gem/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/git_config/aliases b/tests/integration/targets/git_config/aliases
index 806c0598a4d..7b8c653de64 100644
--- a/tests/integration/targets/git_config/aliases
+++ b/tests/integration/targets/git_config/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 skip/aix
 destructive
diff --git a/tests/integration/targets/github_issue/aliases b/tests/integration/targets/github_issue/aliases
index abaeb52e6da..428e8289dcf 100644
--- a/tests/integration/targets/github_issue/aliases
+++ b/tests/integration/targets/github_issue/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
diff --git a/tests/integration/targets/gitlab_branch/aliases b/tests/integration/targets/gitlab_branch/aliases
index 1a0d20b0b2d..d163e8d9ca9 100644
--- a/tests/integration/targets/gitlab_branch/aliases
+++ b/tests/integration/targets/gitlab_branch/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 disabled
diff --git a/tests/integration/targets/gitlab_deploy_key/aliases b/tests/integration/targets/gitlab_deploy_key/aliases
index 0d1cc45a854..fc0e157c90b 100644
--- a/tests/integration/targets/gitlab_deploy_key/aliases
+++ b/tests/integration/targets/gitlab_deploy_key/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 gitlab/ci
 disabled
diff --git a/tests/integration/targets/gitlab_group/aliases b/tests/integration/targets/gitlab_group/aliases
index 0d1cc45a854..fc0e157c90b 100644
--- a/tests/integration/targets/gitlab_group/aliases
+++ b/tests/integration/targets/gitlab_group/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 gitlab/ci
 disabled
diff --git a/tests/integration/targets/gitlab_hook/aliases b/tests/integration/targets/gitlab_hook/aliases
index 0d1cc45a854..fc0e157c90b 100644
--- a/tests/integration/targets/gitlab_hook/aliases
+++ b/tests/integration/targets/gitlab_hook/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 gitlab/ci
 disabled
diff --git a/tests/integration/targets/gitlab_project/aliases b/tests/integration/targets/gitlab_project/aliases
index 0d1cc45a854..fc0e157c90b 100644
--- a/tests/integration/targets/gitlab_project/aliases
+++ b/tests/integration/targets/gitlab_project/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 gitlab/ci
 disabled
diff --git a/tests/integration/targets/gitlab_runner/aliases b/tests/integration/targets/gitlab_runner/aliases
index 0d1cc45a854..fc0e157c90b 100644
--- a/tests/integration/targets/gitlab_runner/aliases
+++ b/tests/integration/targets/gitlab_runner/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 gitlab/ci
 disabled
diff --git a/tests/integration/targets/gitlab_user/aliases b/tests/integration/targets/gitlab_user/aliases
index 0d1cc45a854..fc0e157c90b 100644
--- a/tests/integration/targets/gitlab_user/aliases
+++ b/tests/integration/targets/gitlab_user/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 gitlab/ci
 disabled
diff --git a/tests/integration/targets/hg/aliases b/tests/integration/targets/hg/aliases
index 8bda40608cb..e1d7ab2a2db 100644
--- a/tests/integration/targets/hg/aliases
+++ b/tests/integration/targets/hg/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python3
 skip/aix
diff --git a/tests/integration/targets/homebrew/aliases b/tests/integration/targets/homebrew/aliases
index 8f34f67cb87..11bb9a08606 100644
--- a/tests/integration/targets/homebrew/aliases
+++ b/tests/integration/targets/homebrew/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/rhel
diff --git a/tests/integration/targets/homebrew_cask/aliases b/tests/integration/targets/homebrew_cask/aliases
index 8f34f67cb87..11bb9a08606 100644
--- a/tests/integration/targets/homebrew_cask/aliases
+++ b/tests/integration/targets/homebrew_cask/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/rhel
diff --git a/tests/integration/targets/homectl/aliases b/tests/integration/targets/homectl/aliases
index 8cee0998536..8d80bf12c3d 100644
--- a/tests/integration/targets/homectl/aliases
+++ b/tests/integration/targets/homectl/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/influxdb_user/aliases b/tests/integration/targets/influxdb_user/aliases
index 14d23a4da14..8c1a7b3298d 100644
--- a/tests/integration/targets/influxdb_user/aliases
+++ b/tests/integration/targets/influxdb_user/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 disabled
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/ini_file/aliases b/tests/integration/targets/ini_file/aliases
index be75e3ddabe..12d1d6617eb 100644
--- a/tests/integration/targets/ini_file/aliases
+++ b/tests/integration/targets/ini_file/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/interfaces_file/aliases b/tests/integration/targets/interfaces_file/aliases
index be75e3ddabe..12d1d6617eb 100644
--- a/tests/integration/targets/interfaces_file/aliases
+++ b/tests/integration/targets/interfaces_file/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/ipify_facts/aliases b/tests/integration/targets/ipify_facts/aliases
index be75e3ddabe..12d1d6617eb 100644
--- a/tests/integration/targets/ipify_facts/aliases
+++ b/tests/integration/targets/ipify_facts/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/iptables_state/aliases b/tests/integration/targets/iptables_state/aliases
index 9f4768782b5..80f7c7e32f7 100644
--- a/tests/integration/targets/iptables_state/aliases
+++ b/tests/integration/targets/iptables_state/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/docker             # kernel modules not loadable
 skip/freebsd            # no iptables/netfilter (Linux specific)
 skip/osx                # no iptables/netfilter (Linux specific)
diff --git a/tests/integration/targets/iso_create/aliases b/tests/integration/targets/iso_create/aliases
index f6ee7272f02..4fb0bec8104 100644
--- a/tests/integration/targets/iso_create/aliases
+++ b/tests/integration/targets/iso_create/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 destructive
 skip/aix
 skip/python2.6
diff --git a/tests/integration/targets/iso_customize/aliases b/tests/integration/targets/iso_customize/aliases
index bc011eaf8d9..54a0f1a04d2 100644
--- a/tests/integration/targets/iso_customize/aliases
+++ b/tests/integration/targets/iso_customize/aliases
@@ -3,7 +3,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 destructive
 skip/aix
 skip/freebsd
@@ -11,4 +11,3 @@ skip/alpine
 skip/python2.6
 skip/docker
 needs/root
-
diff --git a/tests/integration/targets/iso_extract/aliases b/tests/integration/targets/iso_extract/aliases
index b0d05577afe..5b0ab153c80 100644
--- a/tests/integration/targets/iso_extract/aliases
+++ b/tests/integration/targets/iso_extract/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/target/setup_epel
 destructive
 skip/aix
diff --git a/tests/integration/targets/java_cert/aliases b/tests/integration/targets/java_cert/aliases
index b9305b09283..573cb189bfa 100644
--- a/tests/integration/targets/java_cert/aliases
+++ b/tests/integration/targets/java_cert/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/java_keystore/aliases b/tests/integration/targets/java_keystore/aliases
index b9305b09283..573cb189bfa 100644
--- a/tests/integration/targets/java_keystore/aliases
+++ b/tests/integration/targets/java_keystore/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/jboss/aliases b/tests/integration/targets/jboss/aliases
index 23525810c42..38b6706fe15 100644
--- a/tests/integration/targets/jboss/aliases
+++ b/tests/integration/targets/jboss/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/jira/aliases b/tests/integration/targets/jira/aliases
index a58c201a4c5..9c3dc5670a9 100644
--- a/tests/integration/targets/jira/aliases
+++ b/tests/integration/targets/jira/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 unsupported
-shippable/posix/group3
diff --git a/tests/integration/targets/kernel_blacklist/aliases b/tests/integration/targets/kernel_blacklist/aliases
index abc0d5476d7..afda346c4ed 100644
--- a/tests/integration/targets/kernel_blacklist/aliases
+++ b/tests/integration/targets/kernel_blacklist/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
diff --git a/tests/integration/targets/launchd/aliases b/tests/integration/targets/launchd/aliases
index 4507815d097..a350886969d 100644
--- a/tests/integration/targets/launchd/aliases
+++ b/tests/integration/targets/launchd/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/freebsd
 skip/rhel
diff --git a/tests/integration/targets/ldap_search/aliases b/tests/integration/targets/ldap_search/aliases
index 76ff20c90e1..79584454883 100644
--- a/tests/integration/targets/ldap_search/aliases
+++ b/tests/integration/targets/ldap_search/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/listen_ports_facts/aliases b/tests/integration/targets/listen_ports_facts/aliases
index 5e86d2a3f40..620afe071d6 100644
--- a/tests/integration/targets/listen_ports_facts/aliases
+++ b/tests/integration/targets/listen_ports_facts/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 skip/aix
 skip/osx
diff --git a/tests/integration/targets/locale_gen/aliases b/tests/integration/targets/locale_gen/aliases
index 5cbd0a392b5..f7f4063f6cb 100644
--- a/tests/integration/targets/locale_gen/aliases
+++ b/tests/integration/targets/locale_gen/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
 needs/root
-shippable/posix/group3
 skip/aix
diff --git a/tests/integration/targets/lookup_cartesian/aliases b/tests/integration/targets/lookup_cartesian/aliases
index 1ad3384c7eb..2bdcc01132c 100644
--- a/tests/integration/targets/lookup_cartesian/aliases
+++ b/tests/integration/targets/lookup_cartesian/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/lookup_collection_version/aliases b/tests/integration/targets/lookup_collection_version/aliases
index 7a0fc5c1eac..343f119da8e 100644
--- a/tests/integration/targets/lookup_collection_version/aliases
+++ b/tests/integration/targets/lookup_collection_version/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
diff --git a/tests/integration/targets/lookup_dependent/aliases b/tests/integration/targets/lookup_dependent/aliases
index fcbe73470c3..26ad5c2449f 100644
--- a/tests/integration/targets/lookup_dependent/aliases
+++ b/tests/integration/targets/lookup_dependent/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/lookup_dig/aliases b/tests/integration/targets/lookup_dig/aliases
index 1def1a14856..eb449a9cfe9 100644
--- a/tests/integration/targets/lookup_dig/aliases
+++ b/tests/integration/targets/lookup_dig/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/lookup_etcd3/aliases b/tests/integration/targets/lookup_etcd3/aliases
index 9ec66146334..b9f3395f793 100644
--- a/tests/integration/targets/lookup_etcd3/aliases
+++ b/tests/integration/targets/lookup_etcd3/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 destructive
 needs/file/tests/utils/constraints.txt
 needs/target/setup_etcd3
diff --git a/tests/integration/targets/lookup_flattened/aliases b/tests/integration/targets/lookup_flattened/aliases
index 708d3bcd122..0ac9bad98ae 100644
--- a/tests/integration/targets/lookup_flattened/aliases
+++ b/tests/integration/targets/lookup_flattened/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/aix
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/lookup_lmdb_kv/aliases b/tests/integration/targets/lookup_lmdb_kv/aliases
index 7c50594f42d..66632fb4a97 100644
--- a/tests/integration/targets/lookup_lmdb_kv/aliases
+++ b/tests/integration/targets/lookup_lmdb_kv/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 destructive
 skip/aix
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/lookup_passwordstore/aliases b/tests/integration/targets/lookup_passwordstore/aliases
index c9fb7e80db0..0d4c5af3b21 100644
--- a/tests/integration/targets/lookup_passwordstore/aliases
+++ b/tests/integration/targets/lookup_passwordstore/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 destructive
 skip/aix
 skip/rhel
diff --git a/tests/integration/targets/lookup_random_pet/aliases b/tests/integration/targets/lookup_random_pet/aliases
index 708d3bcd122..0ac9bad98ae 100644
--- a/tests/integration/targets/lookup_random_pet/aliases
+++ b/tests/integration/targets/lookup_random_pet/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/aix
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/lookup_random_string/aliases b/tests/integration/targets/lookup_random_string/aliases
index 708d3bcd122..0ac9bad98ae 100644
--- a/tests/integration/targets/lookup_random_string/aliases
+++ b/tests/integration/targets/lookup_random_string/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/aix
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/lookup_random_words/aliases b/tests/integration/targets/lookup_random_words/aliases
index 708d3bcd122..0ac9bad98ae 100644
--- a/tests/integration/targets/lookup_random_words/aliases
+++ b/tests/integration/targets/lookup_random_words/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/aix
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/lvg/aliases b/tests/integration/targets/lvg/aliases
index 01205a3972e..f4617b3377d 100644
--- a/tests/integration/targets/lvg/aliases
+++ b/tests/integration/targets/lvg/aliases
@@ -2,9 +2,9 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
 needs/privileged
-shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/mail/aliases b/tests/integration/targets/mail/aliases
index abc0d5476d7..afda346c4ed 100644
--- a/tests/integration/targets/mail/aliases
+++ b/tests/integration/targets/mail/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
diff --git a/tests/integration/targets/module_helper/aliases b/tests/integration/targets/module_helper/aliases
index be75e3ddabe..12d1d6617eb 100644
--- a/tests/integration/targets/module_helper/aliases
+++ b/tests/integration/targets/module_helper/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/monit/aliases b/tests/integration/targets/monit/aliases
index e60be5e5045..2c2add20757 100644
--- a/tests/integration/targets/monit/aliases
+++ b/tests/integration/targets/monit/aliases
@@ -2,9 +2,9 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 destructive
 needs/target/setup_epel
-shippable/posix/group2
 skip/osx
 skip/macos
 skip/freebsd
diff --git a/tests/integration/targets/mqtt/aliases b/tests/integration/targets/mqtt/aliases
index 471b8e86f55..c25e0b6d55b 100644
--- a/tests/integration/targets/mqtt/aliases
+++ b/tests/integration/targets/mqtt/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/nomad/aliases b/tests/integration/targets/nomad/aliases
index f9f52d7b841..ad2435c82c8 100644
--- a/tests/integration/targets/nomad/aliases
+++ b/tests/integration/targets/nomad/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 nomad_job_info
 destructive
 skip/aix
diff --git a/tests/integration/targets/npm/aliases b/tests/integration/targets/npm/aliases
index b1c4f2872eb..6e2c65f3864 100644
--- a/tests/integration/targets/npm/aliases
+++ b/tests/integration/targets/npm/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 destructive
 skip/aix
 skip/freebsd
diff --git a/tests/integration/targets/odbc/aliases b/tests/integration/targets/odbc/aliases
index 75f18e362c3..2dbf0eac3ed 100644
--- a/tests/integration/targets/odbc/aliases
+++ b/tests/integration/targets/odbc/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/osx
 skip/macos
 skip/rhel8.0
diff --git a/tests/integration/targets/one_host/aliases b/tests/integration/targets/one_host/aliases
index 7fba83598a8..02a31bcd553 100644
--- a/tests/integration/targets/one_host/aliases
+++ b/tests/integration/targets/one_host/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/generic/1
 cloud/opennebula
-shippable/cloud/group1
 disabled  # FIXME
diff --git a/tests/integration/targets/one_template/aliases b/tests/integration/targets/one_template/aliases
index 7fba83598a8..02a31bcd553 100644
--- a/tests/integration/targets/one_template/aliases
+++ b/tests/integration/targets/one_template/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/generic/1
 cloud/opennebula
-shippable/cloud/group1
 disabled  # FIXME
diff --git a/tests/integration/targets/osx_defaults/aliases b/tests/integration/targets/osx_defaults/aliases
index ee063facf6b..bd478505d94 100644
--- a/tests/integration/targets/osx_defaults/aliases
+++ b/tests/integration/targets/osx_defaults/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/rhel
diff --git a/tests/integration/targets/pacman/aliases b/tests/integration/targets/pacman/aliases
index 0262a240bb5..1d25c01932b 100644
--- a/tests/integration/targets/pacman/aliases
+++ b/tests/integration/targets/pacman/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/pam_limits/aliases b/tests/integration/targets/pam_limits/aliases
index 3cde3b17152..b85ae641905 100644
--- a/tests/integration/targets/pam_limits/aliases
+++ b/tests/integration/targets/pam_limits/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/pamd/aliases b/tests/integration/targets/pamd/aliases
index 3cde3b17152..b85ae641905 100644
--- a/tests/integration/targets/pamd/aliases
+++ b/tests/integration/targets/pamd/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/pids/aliases b/tests/integration/targets/pids/aliases
index 7a0fc5c1eac..343f119da8e 100644
--- a/tests/integration/targets/pids/aliases
+++ b/tests/integration/targets/pids/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
diff --git a/tests/integration/targets/pipx/aliases b/tests/integration/targets/pipx/aliases
index 0f370b37767..9f87ec3480c 100644
--- a/tests/integration/targets/pipx/aliases
+++ b/tests/integration/targets/pipx/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 destructive
-shippable/posix/group2
 skip/python2
 skip/python3.5
diff --git a/tests/integration/targets/pipx_info/aliases b/tests/integration/targets/pipx_info/aliases
index c42790aedf2..a28278bbc1e 100644
--- a/tests/integration/targets/pipx_info/aliases
+++ b/tests/integration/targets/pipx_info/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/python2
 skip/python3.5
diff --git a/tests/integration/targets/pkgng/aliases b/tests/integration/targets/pkgng/aliases
index 6972c2b6c8d..e13fde32ce8 100644
--- a/tests/integration/targets/pkgng/aliases
+++ b/tests/integration/targets/pkgng/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/root
 skip/docker
 skip/osx
diff --git a/tests/integration/targets/python_requirements_info/aliases b/tests/integration/targets/python_requirements_info/aliases
index be75e3ddabe..12d1d6617eb 100644
--- a/tests/integration/targets/python_requirements_info/aliases
+++ b/tests/integration/targets/python_requirements_info/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/read_csv/aliases b/tests/integration/targets/read_csv/aliases
index be75e3ddabe..12d1d6617eb 100644
--- a/tests/integration/targets/read_csv/aliases
+++ b/tests/integration/targets/read_csv/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/redis_info/aliases b/tests/integration/targets/redis_info/aliases
index 8573c40daa7..1f1c4baf771 100644
--- a/tests/integration/targets/redis_info/aliases
+++ b/tests/integration/targets/redis_info/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/rundeck/aliases b/tests/integration/targets/rundeck/aliases
index 0da9ab18224..3cf494c4c7a 100644
--- a/tests/integration/targets/rundeck/aliases
+++ b/tests/integration/targets/rundeck/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/sefcontext/aliases b/tests/integration/targets/sefcontext/aliases
index 3a1d1f7e340..d318128f823 100644
--- a/tests/integration/targets/sefcontext/aliases
+++ b/tests/integration/targets/sefcontext/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 needs/root
-shippable/posix/group2
 skip/aix
diff --git a/tests/integration/targets/sensu_client/aliases b/tests/integration/targets/sensu_client/aliases
index 225cabc08b4..bca9905ba6b 100644
--- a/tests/integration/targets/sensu_client/aliases
+++ b/tests/integration/targets/sensu_client/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/root
diff --git a/tests/integration/targets/sensu_handler/aliases b/tests/integration/targets/sensu_handler/aliases
index 225cabc08b4..bca9905ba6b 100644
--- a/tests/integration/targets/sensu_handler/aliases
+++ b/tests/integration/targets/sensu_handler/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/root
diff --git a/tests/integration/targets/shutdown/aliases b/tests/integration/targets/shutdown/aliases
index abc0d5476d7..afda346c4ed 100644
--- a/tests/integration/targets/shutdown/aliases
+++ b/tests/integration/targets/shutdown/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
diff --git a/tests/integration/targets/snap/aliases b/tests/integration/targets/snap/aliases
index b8fcb9ee4af..dcb4aa199ef 100644
--- a/tests/integration/targets/snap/aliases
+++ b/tests/integration/targets/snap/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/snap_alias/aliases b/tests/integration/targets/snap_alias/aliases
index b8fcb9ee4af..dcb4aa199ef 100644
--- a/tests/integration/targets/snap_alias/aliases
+++ b/tests/integration/targets/snap_alias/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/ssh_config/aliases b/tests/integration/targets/ssh_config/aliases
index 6803185a41c..6011128daa7 100644
--- a/tests/integration/targets/ssh_config/aliases
+++ b/tests/integration/targets/ssh_config/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 destructive
-shippable/posix/group2
 skip/python2.6  # stromssh only supports python3
 skip/python2.7  # stromssh only supports python3
 skip/freebsd # stromssh installation fails on freebsd
diff --git a/tests/integration/targets/sudoers/aliases b/tests/integration/targets/sudoers/aliases
index be75e3ddabe..12d1d6617eb 100644
--- a/tests/integration/targets/sudoers/aliases
+++ b/tests/integration/targets/sudoers/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/supervisorctl/aliases b/tests/integration/targets/supervisorctl/aliases
index 453d04cb3b7..58524f1fb18 100644
--- a/tests/integration/targets/supervisorctl/aliases
+++ b/tests/integration/targets/supervisorctl/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 destructive
-shippable/posix/group2
 skip/python3
 skip/aix
diff --git a/tests/integration/targets/sysrc/aliases b/tests/integration/targets/sysrc/aliases
index 6972c2b6c8d..e13fde32ce8 100644
--- a/tests/integration/targets/sysrc/aliases
+++ b/tests/integration/targets/sysrc/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/root
 skip/docker
 skip/osx
diff --git a/tests/integration/targets/terraform/aliases b/tests/integration/targets/terraform/aliases
index 1f9abfc0a2d..1b6e4a26dfa 100644
--- a/tests/integration/targets/terraform/aliases
+++ b/tests/integration/targets/terraform/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/windows
 skip/aix
 skip/osx
diff --git a/tests/integration/targets/test_a_module/aliases b/tests/integration/targets/test_a_module/aliases
index 7a0fc5c1eac..343f119da8e 100644
--- a/tests/integration/targets/test_a_module/aliases
+++ b/tests/integration/targets/test_a_module/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
diff --git a/tests/integration/targets/timezone/aliases b/tests/integration/targets/timezone/aliases
index 86d2291bb51..007bed5386b 100644
--- a/tests/integration/targets/timezone/aliases
+++ b/tests/integration/targets/timezone/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/ufw/aliases b/tests/integration/targets/ufw/aliases
index ba9e581292e..fa4f2a6cd3a 100644
--- a/tests/integration/targets/ufw/aliases
+++ b/tests/integration/targets/ufw/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/wakeonlan/aliases b/tests/integration/targets/wakeonlan/aliases
index 4ed7114b08b..dadd9f37a2c 100644
--- a/tests/integration/targets/wakeonlan/aliases
+++ b/tests/integration/targets/wakeonlan/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/aix
diff --git a/tests/integration/targets/xattr/aliases b/tests/integration/targets/xattr/aliases
index 093fe91e51b..db3751be49f 100644
--- a/tests/integration/targets/xattr/aliases
+++ b/tests/integration/targets/xattr/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/aix
 skip/docker
 skip/freebsd
diff --git a/tests/integration/targets/xfs_quota/aliases b/tests/integration/targets/xfs_quota/aliases
index 41006522bcd..56dffecaa42 100644
--- a/tests/integration/targets/xfs_quota/aliases
+++ b/tests/integration/targets/xfs_quota/aliases
@@ -2,9 +2,9 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 needs/privileged
 needs/root
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/xml/aliases b/tests/integration/targets/xml/aliases
index 64596c2b128..0d1324b22a3 100644
--- a/tests/integration/targets/xml/aliases
+++ b/tests/integration/targets/xml/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/aix
diff --git a/tests/integration/targets/yarn/aliases b/tests/integration/targets/yarn/aliases
index 323adc00f34..cb1bc115a00 100644
--- a/tests/integration/targets/yarn/aliases
+++ b/tests/integration/targets/yarn/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 destructive
 skip/aix
 skip/freebsd
diff --git a/tests/integration/targets/yum_versionlock/aliases b/tests/integration/targets/yum_versionlock/aliases
index 6bbff0fe264..ca3f7e796e1 100644
--- a/tests/integration/targets/yum_versionlock/aliases
+++ b/tests/integration/targets/yum_versionlock/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/zypper/aliases b/tests/integration/targets/zypper/aliases
index 58cfb98d535..e0a62a673cd 100644
--- a/tests/integration/targets/zypper/aliases
+++ b/tests/integration/targets/zypper/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/integration/targets/zypper_repository/aliases b/tests/integration/targets/zypper_repository/aliases
index 58cfb98d535..e0a62a673cd 100644
--- a/tests/integration/targets/zypper_repository/aliases
+++ b/tests/integration/targets/zypper_repository/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
diff --git a/tests/sanity/extra/aliases.py b/tests/sanity/extra/aliases.py
index b5b6fe0538d..8779fec5135 100755
--- a/tests/sanity/extra/aliases.py
+++ b/tests/sanity/extra/aliases.py
@@ -20,13 +20,13 @@ def main():
     with open('.azure-pipelines/azure-pipelines.yml', 'rb') as f:
         azp = yaml.safe_load(f)
 
-    allowed_targets = set(['shippable/cloud/group1'])
+    allowed_targets = set(['azp/generic/1'])
     for stage in azp['stages']:
-        if stage['stage'].startswith(('Sanity', 'Unit', 'Cloud', 'Summary')):
+        if stage['stage'].startswith(('Sanity', 'Unit', 'Generic', 'Summary')):
             continue
         for job in stage['jobs']:
             for group in job['parameters']['groups']:
-                allowed_targets.add('shippable/posix/group{0}'.format(group))
+                allowed_targets.add('azp/posix/{0}'.format(group))
 
     for path in paths:
         targets = []
diff --git a/tests/utils/shippable/cloud.sh b/tests/utils/shippable/generic.sh
similarity index 90%
rename from tests/utils/shippable/cloud.sh
rename to tests/utils/shippable/generic.sh
index a2e6ebf2be2..5fd1fb55aa9 100755
--- a/tests/utils/shippable/cloud.sh
+++ b/tests/utils/shippable/generic.sh
@@ -8,11 +8,10 @@ set -o pipefail -eux
 declare -a args
 IFS='/:' read -ra args <<< "$1"
 
-cloud="${args[0]}"
 python="${args[1]}"
 group="${args[2]}"
 
-target="shippable/${cloud}/group${group}/"
+target="azp/generic/${group}/"
 
 stage="${S:-prod}"
 
diff --git a/tests/utils/shippable/linux-community.sh b/tests/utils/shippable/linux-community.sh
index 5adafa0cff6..48d0d8687d3 100755
--- a/tests/utils/shippable/linux-community.sh
+++ b/tests/utils/shippable/linux-community.sh
@@ -12,9 +12,9 @@ image="${args[1]}"
 python="${args[2]}"
 
 if [ "${#args[@]}" -gt 3 ]; then
-    target="shippable/posix/group${args[3]}/"
+    target="azp/posix/${args[3]}/"
 else
-    target="shippable/posix/"
+    target="azp/posix/"
 fi
 
 # shellcheck disable=SC2086
diff --git a/tests/utils/shippable/linux.sh b/tests/utils/shippable/linux.sh
index ce3ac34df3f..6e1e2350b97 100755
--- a/tests/utils/shippable/linux.sh
+++ b/tests/utils/shippable/linux.sh
@@ -11,9 +11,9 @@ IFS='/:' read -ra args <<< "$1"
 image="${args[1]}"
 
 if [ "${#args[@]}" -gt 2 ]; then
-    target="shippable/posix/group${args[2]}/"
+    target="azp/posix/${args[2]}/"
 else
-    target="shippable/posix/"
+    target="azp/posix/"
 fi
 
 # shellcheck disable=SC2086
diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh
index 725c199b907..84c1ebbe0e8 100755
--- a/tests/utils/shippable/remote.sh
+++ b/tests/utils/shippable/remote.sh
@@ -12,9 +12,9 @@ platform="${args[0]}"
 version="${args[1]}"
 
 if [ "${#args[@]}" -gt 2 ]; then
-    target="shippable/posix/group${args[2]}/"
+    target="azp/posix/${args[2]}/"
 else
-    target="shippable/posix/"
+    target="azp/posix/"
 fi
 
 stage="${S:-prod}"