diff --git a/.github/workflows/component_molecule_packaging.yml b/.github/workflows/component_molecule_packaging.yml
index 378b39663..b55172fce 100644
--- a/.github/workflows/component_molecule_packaging.yml
+++ b/.github/workflows/component_molecule_packaging.yml
@@ -27,4 +27,4 @@ jobs:
           repo_base_url: ${{ inputs.REPO_ENDPOINT }}
           package_name: 'newrelic-infra'
           package_version: ${{ inputs.TAG }}
-          platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,debian-bookworm,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204"
+          platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-bookworm,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204"
diff --git a/test/automated/ansible/group_vars/localhost/main.yml b/test/automated/ansible/group_vars/localhost/main.yml
index c65344fa6..29214ebff 100644
--- a/test/automated/ansible/group_vars/localhost/main.yml
+++ b/test/automated/ansible/group_vars/localhost/main.yml
@@ -231,13 +231,6 @@ instances:
   ############################
   # debian amd64
   ############################
-  - ami: "ami-0f42acddbf04bd1b6"
-    type: "t3a.small"
-    name: "amd64:debian-buster"
-    username: "admin"
-    platform: "linux"
-    python_interpreter: "/usr/bin/python3"
-    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
   - ami: "ami-08a0dab67e025361b"
     type: "t3a.small"
     name: "amd64:debian-bullseye"
@@ -255,13 +248,6 @@ instances:
   ############################
   # debian arm64
   ############################
-  # - ami: "ami-07d2054a4befc97f7"
-  #   type: "t4g.small"
-  #   name: "arm64:debian-buster"
-  #   username: "admin"
-  #   platform: "linux"
-  #   python_interpreter: "/usr/bin/python3"
-  #   launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
   # - ami: "ami-03cabbbc935f5826f"
   #   type: "t4g.small"
   #   name: "arm64:debian-bullseye"
diff --git a/test/automated/ansible/roles/install-crowdstrike-falcon/vars/main.yaml b/test/automated/ansible/roles/install-crowdstrike-falcon/vars/main.yaml
index 924da86e0..df31c96dc 100644
--- a/test/automated/ansible/roles/install-crowdstrike-falcon/vars/main.yaml
+++ b/test/automated/ansible/roles/install-crowdstrike-falcon/vars/main.yaml
@@ -77,15 +77,11 @@ apt:
     hash: "{{ ubuntu_arm64_hash }}"
   - hostname: "arm64:ubuntu16.04"
     hash: "{{ ubuntu_arm64_hash }}"
-  - hostname: "amd64:debian-buster"
-    hash: "{{ ubuntu_debian_amd64_hash}}"
   - hostname: "amd64:debian-bullseye"
     hash: "{{ ubuntu_debian_amd64_hash}}"
   - hostname: "amd64:debian-bookworm"
     hash: "{{ ubuntu_debian_amd64_hash}}"
     # Debian arm64 not supported by CrowdStrike, using Ubuntu arm64 installers instead
-  - hostname: "arm64:debian-buster"
-    hash: "{{ ubuntu_arm64_hash }}"
   - hostname: "arm64:debian-bullseye"
     hash: "{{ ubuntu_arm64_hash }}"
   - hostname: "arm64:debian-bookworm"
diff --git a/test/provision/terraform/caos.auto.tfvars.dist b/test/provision/terraform/caos.auto.tfvars.dist
index 7f0410f74..c1c4e516e 100644
--- a/test/provision/terraform/caos.auto.tfvars.dist
+++ b/test/provision/terraform/caos.auto.tfvars.dist
@@ -2,9 +2,9 @@ ec2_prefix = "PREFIX:TAG_OR_UNIQUE_NAME"
 
 windows_ec2 = ["windows_2012", "windows_2016", "windows_2019", "windows_2022"]
 
-linux_ec2_amd = ["amd64:ubuntu22.04", "amd64:ubuntu20.04", "amd64:ubuntu16.04", "amd64:ubuntu18.04", "amd64:centos7", "amd64:centos8", "amd64:centos-stream", "amd64:sles-12.5", "amd64:sles-15.2", "amd64:sles-15.3",  "amd64:sles-15.4", "amd64:sles-15.5", "amd64:redhat-7.9", "amd64:redhat-8.4", "amd64:redhat-9.0", "amd64:debian-buster", "amd64:debian-bookworm", "amd64:al-2", "amd64:al-2023"]
+linux_ec2_amd = ["amd64:ubuntu22.04", "amd64:ubuntu20.04", "amd64:ubuntu16.04", "amd64:ubuntu18.04", "amd64:centos7", "amd64:centos8", "amd64:centos-stream", "amd64:sles-12.5", "amd64:sles-15.2", "amd64:sles-15.3",  "amd64:sles-15.4", "amd64:sles-15.5", "amd64:redhat-7.9", "amd64:redhat-8.4", "amd64:redhat-9.0", "amd64:debian-bookworm", "amd64:al-2", "amd64:al-2023"]
 
-linux_ec2_arm = ["arm64:ubuntu22.04", "arm64:ubuntu20.04", "arm64:ubuntu16.04", "arm64:ubuntu18.04", "arm64:centos7", "arm64:centos8", "arm64:centos-stream", "arm64:sles-15.3",  "arm64:sles-15.4", "arm64:sles-15.5", "arm64:redhat-7.6", "arm64:redhat-9.0", "arm64:debian-buster", "arm64:debian-bookworm", "arm64:al-2", "arm64:al-2023"]
+linux_ec2_arm = ["arm64:ubuntu22.04", "arm64:ubuntu20.04", "arm64:ubuntu16.04", "arm64:ubuntu18.04", "arm64:centos7", "arm64:centos8", "arm64:centos-stream", "arm64:sles-15.3",  "arm64:sles-15.4", "arm64:sles-15.5", "arm64:redhat-7.6", "arm64:redhat-9.0", "arm64:debian-bookworm", "arm64:al-2", "arm64:al-2023"]
 
 ssh_pub_key      = "AAAAB3NzaC1yc2EAAAADAQABAAABAQDH9C7BS2XrtXGXFFyL0pNku/Hfy84RliqvYKpuslJFeUivf5QY6Ipi8yXfXn6TsRDbdxfGPi6oOR60Fa+4cJmCo6N5g57hBS6f2IdzQBNrZr7i1I/a3cFeK6XOc1G1tQaurx7Pu+qvACfJjLXKG66tHlaVhAHd/1l2FocgFNUDFFuKS3mnzt9hKys7sB4aO3O0OdohN/0NJC4ldV8/OmeXqqfkiPWcgPx3C8bYyXCX7QJNBHKrzbX1jW51Px7SIDWFDV6kxGwpQGGBMJg/k79gjjM+jhn4fg1/VP/Fx37mAnfLqpcTfiOkzSE80ORGefQ1XfGK/Dpa3ITrzRYW8xlR caos-dev-arm"
 pvt_key          = "~/.ssh/caos-dev-arm.cer"