diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
index 9b94fe17..e5819b94 100644
--- a/lib/beaker-hostgenerator/data.rb
+++ b/lib/beaker-hostgenerator/data.rb
@@ -1121,6 +1121,8 @@ def generate_osinfo
       end
 
       # Amazon Linux
+      yield %w[amazon2-64 amazon-2-x86_64]
+      yield %w[amazon2-AARCH64 amazon-2-aarch64]
       yield %w[amazon7-64 amazon-7-x86_64]
       yield %w[amazon7-AARCH64 amazon-7-aarch64]
       yield %w[amazon2023-64 amazon-2023-x86_64]
diff --git a/test/fixtures/generated/default/amazon2-64d b/test/fixtures/generated/default/amazon2-64d
new file mode 100644
index 00000000..c45d1d7e
--- /dev/null
+++ b/test/fixtures/generated/default/amazon2-64d
@@ -0,0 +1,14 @@
+---
+arguments_string: amazon2-64d
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2-64-1:
+      platform: amazon-2-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/default/amazon2-AARCH64f b/test/fixtures/generated/default/amazon2-AARCH64f
new file mode 100644
index 00000000..746d3476
--- /dev/null
+++ b/test/fixtures/generated/default/amazon2-AARCH64f
@@ -0,0 +1,14 @@
+---
+arguments_string: amazon2-AARCH64f
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2-AARCH64-1:
+      platform: amazon-2-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - frictionless
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/multiplatform/amazon2-64d-solaris11-SPARC-amazon2-64c b/test/fixtures/generated/multiplatform/amazon2-64d-solaris11-SPARC-amazon2-64c
new file mode 100644
index 00000000..3708f6cd
--- /dev/null
+++ b/test/fixtures/generated/multiplatform/amazon2-64d-solaris11-SPARC-amazon2-64c
@@ -0,0 +1,25 @@
+---
+arguments_string: amazon2-64d-solaris11-SPARC-amazon2-64c
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2-64-1:
+      platform: amazon-2-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+    solaris11-SPARC-1:
+      platform: solaris-11-sparc
+      hypervisor: vmpooler
+      roles:
+      - agent
+    amazon2-64-2:
+      platform: amazon-2-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/multiplatform/amazon2-AARCH64f-solaris11-64-amazon2-AARCH64l b/test/fixtures/generated/multiplatform/amazon2-AARCH64f-solaris11-64-amazon2-AARCH64l
new file mode 100644
index 00000000..9eb8de65
--- /dev/null
+++ b/test/fixtures/generated/multiplatform/amazon2-AARCH64f-solaris11-64-amazon2-AARCH64l
@@ -0,0 +1,26 @@
+---
+arguments_string: amazon2-AARCH64f-solaris11-64-amazon2-AARCH64l
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2-AARCH64-1:
+      platform: amazon-2-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - frictionless
+    solaris11-64-1:
+      platform: solaris-11-i386
+      template: solaris-11-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    amazon2-AARCH64-2:
+      platform: amazon-2-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - classifier
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/multiplatform/solaris11-64d-amazon2-AARCH64-solaris11-64c b/test/fixtures/generated/multiplatform/solaris11-64d-amazon2-AARCH64-solaris11-64c
new file mode 100644
index 00000000..ac6bb45c
--- /dev/null
+++ b/test/fixtures/generated/multiplatform/solaris11-64d-amazon2-AARCH64-solaris11-64c
@@ -0,0 +1,27 @@
+---
+arguments_string: solaris11-64d-amazon2-AARCH64-solaris11-64c
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    solaris11-64-1:
+      platform: solaris-11-i386
+      template: solaris-11-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+    amazon2-AARCH64-1:
+      platform: amazon-2-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    solaris11-64-2:
+      platform: solaris-11-i386
+      template: solaris-11-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/multiplatform/solaris11-SPARCf-amazon2-64-solaris11-SPARCl b/test/fixtures/generated/multiplatform/solaris11-SPARCf-amazon2-64-solaris11-SPARCl
new file mode 100644
index 00000000..70ecc865
--- /dev/null
+++ b/test/fixtures/generated/multiplatform/solaris11-SPARCf-amazon2-64-solaris11-SPARCl
@@ -0,0 +1,25 @@
+---
+arguments_string: solaris11-SPARCf-amazon2-64-solaris11-SPARCl
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    solaris11-SPARC-1:
+      platform: solaris-11-sparc
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - frictionless
+    amazon2-64-1:
+      platform: amazon-2-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    solaris11-SPARC-2:
+      platform: solaris-11-sparc
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - classifier
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/osinfo-version-0/amazon2-64d b/test/fixtures/generated/osinfo-version-0/amazon2-64d
new file mode 100644
index 00000000..ecd3b54c
--- /dev/null
+++ b/test/fixtures/generated/osinfo-version-0/amazon2-64d
@@ -0,0 +1,14 @@
+---
+arguments_string: "--osinfo-version 0 amazon2-64d"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2-64-1:
+      platform: amazon-2-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/osinfo-version-0/amazon2-AARCH64f b/test/fixtures/generated/osinfo-version-0/amazon2-AARCH64f
new file mode 100644
index 00000000..49f66a87
--- /dev/null
+++ b/test/fixtures/generated/osinfo-version-0/amazon2-AARCH64f
@@ -0,0 +1,14 @@
+---
+arguments_string: "--osinfo-version 0 amazon2-AARCH64f"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2-AARCH64-1:
+      platform: amazon-2-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - frictionless
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/osinfo-version-1/amazon2-64d b/test/fixtures/generated/osinfo-version-1/amazon2-64d
new file mode 100644
index 00000000..3538ac9c
--- /dev/null
+++ b/test/fixtures/generated/osinfo-version-1/amazon2-64d
@@ -0,0 +1,14 @@
+---
+arguments_string: "--osinfo-version 1 amazon2-64d"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2-64-1:
+      platform: amazon-2-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: 
diff --git a/test/fixtures/generated/osinfo-version-1/amazon2-AARCH64f b/test/fixtures/generated/osinfo-version-1/amazon2-AARCH64f
new file mode 100644
index 00000000..eb458882
--- /dev/null
+++ b/test/fixtures/generated/osinfo-version-1/amazon2-AARCH64f
@@ -0,0 +1,14 @@
+---
+arguments_string: "--osinfo-version 1 amazon2-AARCH64f"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2-AARCH64-1:
+      platform: amazon-2-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - frictionless
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: