diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
index 426a8de8..5d0b670a 100644
--- a/lib/beaker-hostgenerator/data.rb
+++ b/lib/beaker-hostgenerator/data.rb
@@ -391,6 +391,48 @@ def osinfo
                           'template' => 'redhat-9-arm64',
                         },
                       },
+                      'rocky8-64' => {
+                        general: {
+                          'platform' => 'el-8-x86_64',
+                        },
+                      },
+                      'rocky9-64' => {
+                        general: {
+                          'platform' => 'el-9-x86_64',
+                        },
+                      },
+                      'rocky9-AARCH64' => {
+                        general: {
+                          'platform' => 'el-9-aarch64',
+                        },
+                        abs: {
+                          'template' => 'rocky-9-arm64',
+                        },
+                        vmpooler: {
+                          'template' => 'rocky-9-arm64',
+                        },
+                      },
+                      'almalinux8-64' => {
+                        general: {
+                          'platform' => 'el-8-x86_64',
+                        },
+                      },
+                      'almalinux9-64' => {
+                        general: {
+                          'platform' => 'el-9-x86_64',
+                        },
+                      },
+                      'almalinux9-AARCH64' => {
+                        general: {
+                          'platform' => 'el-9-aarch64',
+                        },
+                        abs: {
+                          'template' => 'almalinux-9-arm64',
+                        },
+                        vmpooler: {
+                          'template' => 'almalinux-9-arm64',
+                        },
+                      },
                       'redhat9-POWER' => {
                         general: {
                           'platform' => 'el-9-ppc64le',
@@ -1135,14 +1177,6 @@ def generate_osinfo
       yield %w[amazon2023-64 amazon-2023-x86_64]
       yield %w[amazon2023-AARCH64 amazon-2023-aarch64]
 
-      # AlmaLinux and Rocky
-      %w[almalinux rocky].each do |os|
-        (8..9).each do |release|
-          yield ["#{os}#{release}-64", "el-#{release}-x86_64"]
-          yield ["#{os}#{release}-AARCH64", "el-#{release}-aarch64"]
-        end
-      end
-
       # Oracle / OracleLinux
       yield ['oracle6-32', 'el-6-i386']
       (6..9).each do |release|
diff --git a/test/fixtures/generated/default/almalinux9-AARCH64d b/test/fixtures/generated/default/almalinux9-AARCH64d
index 8d8cea80..11bf4905 100644
--- a/test/fixtures/generated/default/almalinux9-AARCH64d
+++ b/test/fixtures/generated/default/almalinux9-AARCH64d
@@ -6,7 +6,7 @@ expected_hash:
     almalinux9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: almalinux-9-aarch64
+      template: almalinux-9-arm64
       roles:
       - agent
       - database
diff --git a/test/fixtures/generated/default/rocky9-AARCH64a b/test/fixtures/generated/default/rocky9-AARCH64a
index 51a8e436..695c30f2 100644
--- a/test/fixtures/generated/default/rocky9-AARCH64a
+++ b/test/fixtures/generated/default/rocky9-AARCH64a
@@ -6,7 +6,7 @@ expected_hash:
     rocky9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: rocky-9-aarch64
+      template: rocky-9-arm64
       roles:
       - agent
   CONFIG:
diff --git a/test/fixtures/generated/multiplatform/almalinux9-AARCH64d-sles12-S390X-almalinux9-AARCH64c b/test/fixtures/generated/multiplatform/almalinux9-AARCH64d-sles12-S390X-almalinux9-AARCH64c
index 7e4fcdd8..dc6bd6ad 100644
--- a/test/fixtures/generated/multiplatform/almalinux9-AARCH64d-sles12-S390X-almalinux9-AARCH64c
+++ b/test/fixtures/generated/multiplatform/almalinux9-AARCH64d-sles12-S390X-almalinux9-AARCH64c
@@ -6,7 +6,7 @@ expected_hash:
     almalinux9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: almalinux-9-aarch64
+      template: almalinux-9-arm64
       roles:
       - agent
       - database
@@ -18,7 +18,7 @@ expected_hash:
     almalinux9-AARCH64-2:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: almalinux-9-aarch64
+      template: almalinux-9-arm64
       roles:
       - agent
       - dashboard
diff --git a/test/fixtures/generated/multiplatform/rocky9-AARCH64a-sles11-32-rocky9-AARCH64aulcdfm b/test/fixtures/generated/multiplatform/rocky9-AARCH64a-sles11-32-rocky9-AARCH64aulcdfm
index 3071fdf2..81a3c2f1 100644
--- a/test/fixtures/generated/multiplatform/rocky9-AARCH64a-sles11-32-rocky9-AARCH64aulcdfm
+++ b/test/fixtures/generated/multiplatform/rocky9-AARCH64a-sles11-32-rocky9-AARCH64aulcdfm
@@ -6,7 +6,7 @@ expected_hash:
     rocky9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: rocky-9-aarch64
+      template: rocky-9-arm64
       roles:
       - agent
     sles11-32-1:
@@ -18,7 +18,7 @@ expected_hash:
     rocky9-AARCH64-2:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: rocky-9-aarch64
+      template: rocky-9-arm64
       roles:
       - agent
       - ca
diff --git a/test/fixtures/generated/multiplatform/sles11-32d-rocky9-AARCH64-sles11-32c b/test/fixtures/generated/multiplatform/sles11-32d-rocky9-AARCH64-sles11-32c
index ec8bded1..f6637bae 100644
--- a/test/fixtures/generated/multiplatform/sles11-32d-rocky9-AARCH64-sles11-32c
+++ b/test/fixtures/generated/multiplatform/sles11-32d-rocky9-AARCH64-sles11-32c
@@ -13,7 +13,7 @@ expected_hash:
     rocky9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: rocky-9-aarch64
+      template: rocky-9-arm64
       roles:
       - agent
     sles11-32-2:
diff --git a/test/fixtures/generated/multiplatform/sles12-S390Xa-almalinux9-AARCH64-sles12-S390Xaulcdfm b/test/fixtures/generated/multiplatform/sles12-S390Xa-almalinux9-AARCH64-sles12-S390Xaulcdfm
index 12bebca7..f3ecea99 100644
--- a/test/fixtures/generated/multiplatform/sles12-S390Xa-almalinux9-AARCH64-sles12-S390Xaulcdfm
+++ b/test/fixtures/generated/multiplatform/sles12-S390Xa-almalinux9-AARCH64-sles12-S390Xaulcdfm
@@ -11,7 +11,7 @@ expected_hash:
     almalinux9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: almalinux-9-aarch64
+      template: almalinux-9-arm64
       roles:
       - agent
     sles12-S390X-2:
diff --git a/test/fixtures/generated/osinfo-version-0/almalinux9-AARCH64d b/test/fixtures/generated/osinfo-version-0/almalinux9-AARCH64d
index 1f712d86..0442eba4 100644
--- a/test/fixtures/generated/osinfo-version-0/almalinux9-AARCH64d
+++ b/test/fixtures/generated/osinfo-version-0/almalinux9-AARCH64d
@@ -6,7 +6,7 @@ expected_hash:
     almalinux9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: almalinux-9-aarch64
+      template: almalinux-9-arm64
       roles:
       - agent
       - database
diff --git a/test/fixtures/generated/osinfo-version-0/rocky9-AARCH64a b/test/fixtures/generated/osinfo-version-0/rocky9-AARCH64a
index c5d7257a..b1b04cc5 100644
--- a/test/fixtures/generated/osinfo-version-0/rocky9-AARCH64a
+++ b/test/fixtures/generated/osinfo-version-0/rocky9-AARCH64a
@@ -6,7 +6,7 @@ expected_hash:
     rocky9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: rocky-9-aarch64
+      template: rocky-9-arm64
       roles:
       - agent
   CONFIG:
diff --git a/test/fixtures/generated/osinfo-version-1/almalinux9-AARCH64d b/test/fixtures/generated/osinfo-version-1/almalinux9-AARCH64d
index c27f07f1..f07327d5 100644
--- a/test/fixtures/generated/osinfo-version-1/almalinux9-AARCH64d
+++ b/test/fixtures/generated/osinfo-version-1/almalinux9-AARCH64d
@@ -6,7 +6,7 @@ expected_hash:
     almalinux9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: almalinux-9-aarch64
+      template: almalinux-9-arm64
       roles:
       - agent
       - database
diff --git a/test/fixtures/generated/osinfo-version-1/rocky9-AARCH64a b/test/fixtures/generated/osinfo-version-1/rocky9-AARCH64a
index 9138e202..c130d6a8 100644
--- a/test/fixtures/generated/osinfo-version-1/rocky9-AARCH64a
+++ b/test/fixtures/generated/osinfo-version-1/rocky9-AARCH64a
@@ -6,7 +6,7 @@ expected_hash:
     rocky9-AARCH64-1:
       platform: el-9-aarch64
       hypervisor: vmpooler
-      template: rocky-9-aarch64
+      template: rocky-9-arm64
       roles:
       - agent
   CONFIG: