diff --git a/templates/packer/ansible/inventory/fedora-36-aarch64/group_vars/all.yml b/templates/packer/ansible/inventory/fedora-36-aarch64/group_vars/all.yml
new file mode 100644
index 000000000..04147ed09
--- /dev/null
+++ b/templates/packer/ansible/inventory/fedora-36-aarch64/group_vars/all.yml
@@ -0,0 +1,5 @@
+---
+# this is just a template!
+# the actual content is generated by build/appsre-build-worker-packer.sh
+rpmrepo_distribution: distro
+osbuild_commit: abcdef
diff --git a/templates/packer/ansible/inventory/fedora-36-x86_64/group_vars/all.yml b/templates/packer/ansible/inventory/fedora-36-x86_64/group_vars/all.yml
new file mode 100644
index 000000000..04147ed09
--- /dev/null
+++ b/templates/packer/ansible/inventory/fedora-36-x86_64/group_vars/all.yml
@@ -0,0 +1,5 @@
+---
+# this is just a template!
+# the actual content is generated by build/appsre-build-worker-packer.sh
+rpmrepo_distribution: distro
+osbuild_commit: abcdef
diff --git a/templates/packer/worker.pkr.hcl b/templates/packer/worker.pkr.hcl
index ebf03dc10..67a938aa0 100644
--- a/templates/packer/worker.pkr.hcl
+++ b/templates/packer/worker.pkr.hcl
@@ -167,6 +167,80 @@ update-crypto-policies --set LEGACY
 EOF
   }
 
+  source "amazon-ebs.image_builder"  {
+    name = "fedora-36-x86_64"
+
+    # Use a static Fedora 36 Cloud Base Image.
+    source_ami = "ami-08b7bda26f4071b80"
+    ssh_username = "fedora"
+    instance_type = "c6a.large"
+
+    # Set a name for the resulting AMI.
+    ami_name = "${var.image_name}-fedora-36-x86_64"
+
+    # Apply tags to the resulting AMI/EBS snapshot.
+    tags = {
+      AppCode = "IMGB-001"
+      Name = "${var.image_name}-fedora-36-x86_64"
+      composer_commit = "${var.composer_commit}"
+      os = "fedora"
+      os_version = "36"
+      arch = "x86_64"
+    }
+
+    # Ensure that the EBS snapshot used for the AMI meets our requirements.
+    launch_block_device_mappings {
+      delete_on_termination = "true"
+      device_name           = "/dev/sda1"
+      volume_size           = 5
+      volume_type           = "gp2"
+    }
+
+    # go doesn't like modern Fedora crypto policies
+    # see https://github.com/hashicorp/packer/issues/10074
+    user_data = <<EOF
+#!/bin/bash
+update-crypto-policies --set LEGACY
+EOF
+  }
+
+  source "amazon-ebs.image_builder"  {
+    name = "fedora-36-aarch64"
+
+    # Use a static Fedora 36 Cloud Base Image.
+    source_ami = "ami-01925eb0821988986"
+    ssh_username = "fedora"
+    instance_type = "c6g.large"
+
+    # Set a name for the resulting AMI.
+    ami_name = "${var.image_name}-fedora-36-aarch64"
+
+    # Apply tags to the resulting AMI/EBS snapshot.
+    tags = {
+      AppCode = "IMGB-001"
+      Name = "${var.image_name}-fedora-36-aarch64"
+      composer_commit = "${var.composer_commit}"
+      os = "fedora"
+      os_version = "36"
+      arch = "aarch64"
+    }
+
+    # Ensure that the EBS snapshot used for the AMI meets our requirements.
+    launch_block_device_mappings {
+      delete_on_termination = "true"
+      device_name           = "/dev/sda1"
+      volume_size           = 5
+      volume_type           = "gp2"
+    }
+
+    # go doesn't like modern Fedora crypto policies
+    # see https://github.com/hashicorp/packer/issues/10074
+    user_data = <<EOF
+#!/bin/bash
+update-crypto-policies --set LEGACY
+EOF
+  }
+
   provisioner "ansible" {
     playbook_file = "${path.root}/ansible/playbook.yml"
     user = build.User