diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 16783c5f3b0..fe19caf36b3 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -120,7 +120,7 @@ jobs:
         if: ${{ inputs.runStandalone }}
         run: |
           make moxy
-          cd ../.. && make build/apm-server-linux-arm64
+          cd ../.. && make build/apm-server-linux-amd64 && mv build/apm-server-linux-amd64 build/apm-server
 
       - name: Override docker committed version
         if: ${{ ! inputs.runOnStable && ! inputs.runStandalone}}
diff --git a/testing/benchmark/main.tf b/testing/benchmark/main.tf
index bacca618648..2b337e346bc 100644
--- a/testing/benchmark/main.tf
+++ b/testing/benchmark/main.tf
@@ -107,7 +107,7 @@ module "standalone_apm_server" {
   count  = var.run_standalone ? 1 : 0
   source = "../infra/terraform/modules/standalone_apm_server"
 
-  aws_os              = "amzn2-ami-kernel-5.10"
+  aws_os              = "amzn2-ami-hvm-*-x86_64-ebs"
   ea_managed          = false
   apm_server_bin_path = var.apm_server_bin_path
   apm_instance_type   = var.worker_instance_type
diff --git a/testing/benchmark/variables.tf b/testing/benchmark/variables.tf
index 411941ac88a..bc36d36eaa7 100644
--- a/testing/benchmark/variables.tf
+++ b/testing/benchmark/variables.tf
@@ -93,7 +93,7 @@ variable "drop_pipeline" {
 }
 
 variable "apm_server_bin_path" {
-  default     = "../../build/apm-server-linux-amd64"
+  default     = "../../build"
   type        = string
   description = "Optional path to the apm-server binary"
 }
diff --git a/testing/infra/terraform/modules/moxy/main.tf b/testing/infra/terraform/modules/moxy/main.tf
index d95aec1f39b..7141c2de5d4 100644
--- a/testing/infra/terraform/modules/moxy/main.tf
+++ b/testing/infra/terraform/modules/moxy/main.tf
@@ -67,7 +67,7 @@ resource "aws_instance" "moxy" {
   }
 
   provisioner "file" {
-    source      = var.moxy_bin_path
+    source      = "${var.moxy_bin_path}/moxy"
     destination = local.bin_path
   }
   provisioner "remote-exec" {
diff --git a/testing/infra/terraform/modules/moxy/outputs.tf b/testing/infra/terraform/modules/moxy/outputs.tf
index 8f8465f9bc5..a9c9844a84b 100644
--- a/testing/infra/terraform/modules/moxy/outputs.tf
+++ b/testing/infra/terraform/modules/moxy/outputs.tf
@@ -1,4 +1,4 @@
 output "moxy_url" {
-  value       = "${aws_instance.moxy.public_ip}:${local.moxy_port}"
+  value       = "http://${aws_instance.moxy.public_ip}:${local.moxy_port}"
   description = "The Moxy Server URL"
 }
diff --git a/testing/infra/terraform/modules/standalone_apm_server/main.tf b/testing/infra/terraform/modules/standalone_apm_server/main.tf
index 01c7a44f3b9..e353691be1a 100644
--- a/testing/infra/terraform/modules/standalone_apm_server/main.tf
+++ b/testing/infra/terraform/modules/standalone_apm_server/main.tf
@@ -6,6 +6,7 @@ locals {
     "debian-10-arm64"                  = "136693071363" # debian
     "debian-11-arm64"                  = "136693071363" # debian
     "amzn2-ami-kernel-5.10"            = "137112412989" # amazon
+    "amzn2-ami-hvm-*-x86_64-ebs"       = "137112412989" #amazon
     "al2023-ami-2023"                  = "137112412989" # amazon
     "RHEL-7"                           = "309956199498" # Red Hat
     "RHEL-8"                           = "309956199498" # Red Hat
@@ -18,6 +19,7 @@ locals {
     "debian-10-arm64"                  = "t4g.nano"
     "debian-11-arm64"                  = "t4g.nano"
     "amzn2-ami-kernel-5.10"            = "t4g.nano"
+    "amzn2-ami-hvm-*-x86_64-ebs"       = "t4g.nano"
     "al2023-ami-2023"                  = "t4g.nano"
     "RHEL-7"                           = "t3a.micro" # RHEL-7 doesn't support arm
     "RHEL-8"                           = "t4g.micro" # RHEL doesn't support nano instances
@@ -30,6 +32,7 @@ locals {
     "debian-10-arm64"                  = "arm64"
     "debian-11-arm64"                  = "arm64"
     "amzn2-ami-kernel-5.10"            = "arm64"
+    "amzn2-ami-hvm-*-x86_64-ebs"       = "x86_64"
     "al2023-ami-2023"                  = "arm64"
     "RHEL-7"                           = "x86_64" # RHEL-7 doesn't support arm
     "RHEL-8"                           = "arm64"
@@ -66,6 +69,7 @@ locals {
     "debian-10-arm64"                  = "admin"
     "debian-11-arm64"                  = "admin"
     "amzn2-ami-kernel-5.10"            = "ec2-user"
+    "amzn2-ami-hvm-*-x86_64-ebs"       = "ec2-user"
     "al2023-ami-2023"                  = "ec2-user"
     "RHEL-7"                           = "ec2-user"
     "RHEL-8"                           = "ec2-user"
@@ -103,6 +107,16 @@ data "aws_ami" "os" {
   owners = [local.image_owners[var.aws_os]]
 }
 
+data "aws_ami" "worker_ami" {
+  owners      = ["amazon"]
+  most_recent = true
+
+  filter {
+    name   = "name"
+    values = ["amzn2-ami-hvm-*-x86_64-ebs"]
+  }
+}
+
 resource "aws_security_group" "main" {
   egress = [
     {
@@ -156,7 +170,7 @@ resource "aws_instance" "apm" {
   }
 
   provisioner "file" {
-    source      = var.apm_server_bin_path
+    source      = "${var.apm_server_bin_path}/apm-server"
     destination = local.bin_path
   }
 
diff --git a/testing/infra/terraform/modules/standalone_apm_server/outputs.tf b/testing/infra/terraform/modules/standalone_apm_server/outputs.tf
index f3cda741079..7491343d314 100644
--- a/testing/infra/terraform/modules/standalone_apm_server/outputs.tf
+++ b/testing/infra/terraform/modules/standalone_apm_server/outputs.tf
@@ -5,6 +5,6 @@ output "apm_secret_token" {
 }
 
 output "apm_server_url" {
-  value       = "${aws_instance.apm.public_ip}:${local.apm_port}"
+  value       = "http://${aws_instance.apm.public_ip}:${local.apm_port}"
   description = "The APM Server URL"
 }