diff --git a/templates/packer/worker.pkr.hcl b/templates/packer/worker.pkr.hcl
index 7fb8de3ad..1f02b98cd 100644
--- a/templates/packer/worker.pkr.hcl
+++ b/templates/packer/worker.pkr.hcl
@@ -1,57 +1,58 @@
 source "amazon-ebs" "image_builder" {
-
   # AWS settings.
   access_key = var.aws_access_key
   secret_key = var.aws_secret_key
   region = var.region
 
-  # Use a static RHEL 8.5 Cloud Access Image.
-  source_ami          = "ami-06f1e6f8b3457ae7c"
-
   # Remove previous image before making the new one.
   force_deregister = true
   force_delete_snapshot = true
 
-  # 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           = 10
-    volume_type           = "gp2"
-  }
-
   # Apply tags to the instance that is building our image.
   run_tags = {
     AppCode = "IMGB-001"
-    Name = "packer-builder-for-${var.image_name}"
+    Name = "packer-builder-for-${var.image_name}-${source.name}"
   }
 
-  # Apply tags to the resulting AMI/EBS snapshot.
-  tags = {
-    AppCode = "IMGB-001"
-    Name = "${var.image_name}"
-    composer_commit = "${var.composer_commit}"
-    osbuild_commit = "${var.osbuild_commit}"
-    os = "rhel"
-    os_version = "8"
-    arch = "x86_64"
-  }
-
-  # Set a name for the resulting AMI.
-  ami_name = "${var.image_name}"
-
   # Share the resulting AMI with accounts
   ami_users = "${var.image_users}"
 
   # Network configuration for the instance building our image.
   associate_public_ip_address = true
   ssh_interface = "public_ip"
-  ssh_username = "ec2-user"
   instance_type = "c6a.large"
 }
 
 build {
-  sources = ["source.amazon-ebs.image_builder"]
+  source "amazon-ebs.image_builder" {
+    name = "rhel-8-x86_64"
+
+    # Use a static RHEL 8.5 Cloud Access Image.
+    source_ami = "ami-06f1e6f8b3457ae7c"
+    ssh_username = "ec2-user"
+
+    # Set a name for the resulting AMI.
+    ami_name = "${var.image_name}"
+
+    # Apply tags to the resulting AMI/EBS snapshot.
+    tags = {
+      AppCode = "IMGB-001"
+      Name = "${var.image_name}"
+      composer_commit = "${var.composer_commit}"
+      osbuild_commit = "${var.osbuild_commit}"
+      os = "rhel"
+      os_version = "8"
+      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           = 10
+      volume_type           = "gp2"
+    }
+  }
 
   provisioner "ansible" {
     playbook_file = "${path.root}/ansible/playbook.yml"