diff --git a/recipes/newrelic/infrastructure/ubuntu.yml b/recipes/newrelic/infrastructure/ubuntu.yml
index 9a1d7c2d0..f281f3ffb 100644
--- a/recipes/newrelic/infrastructure/ubuntu.yml
+++ b/recipes/newrelic/infrastructure/ubuntu.yml
@@ -22,6 +22,7 @@ keywords:
   - Bionic
   - Focal
   - Jammy
+  - Noble
 
 processMatch: []
 
diff --git a/test/definitions-eu/infra-agent/debians/ubuntu21x04hirsute-infra.json b/test/definitions-eu/infra-agent/debians/ubuntu21x04hirsute-infra.json
deleted file mode 100644
index 89185a7c2..000000000
--- a/test/definitions-eu/infra-agent/debians/ubuntu21x04hirsute-infra.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "global_tags": {
-        "owning_team": "virtuoso",
-        "Environment": "development",
-        "Department": "product",
-        "Product": "virtuoso"
-    },
-
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t3.nano",
-        "ami_name": "ubuntu-minimal/images/hvm-ssd/ubuntu-hirsute-21.04-amd64-minimal-20220119",
-        "user_name": "ubuntu"
-    }],
-
-    "instrumentations": {
-      "resources": [
-        {
-            "id": "nr_infra",
-            "resource_ids": ["host1"],
-            "provider": "newrelic",
-            "source_repository": "https://github.com/newrelic/open-install-library",
-            "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
-            "params": {
-                "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ubuntu.yml",
-                "validate_output": "Infrastructure Agent\\s+\\(installed\\)"
-            }
-        }
-        ]
-    }
-}
diff --git a/test/definitions/infra-agent/ubuntu21-infra-unsupported.json b/test/definitions/infra-agent/ubuntu24-infra.json
similarity index 78%
rename from test/definitions/infra-agent/ubuntu21-infra-unsupported.json
rename to test/definitions/infra-agent/ubuntu24-infra.json
index 13c71d1ae..74c2d8eba 100644
--- a/test/definitions/infra-agent/ubuntu21-infra-unsupported.json
+++ b/test/definitions/infra-agent/ubuntu24-infra.json
@@ -12,7 +12,7 @@
         "provider": "aws",
         "type": "ec2",
         "size": "t3.micro",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-impish-21.??-amd64-server-????????",
+        "ami_name": "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-????????",
         "user_name": "ubuntu"
       }
     ],
@@ -20,13 +20,13 @@
     "instrumentations": {
       "resources": [
         {
-          "id": "nr_infra_ubuntu21",
+          "id": "nr_infra_ubuntu24",
           "resource_ids": ["host1"],
           "provider": "newrelic",
           "source_repository": "https://github.com/newrelic/open-install-library",
           "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
           "params": {
-            "validate_output": "Infrastructure Agent\\s+\\(unsupported\\)",
+            "validate_output": "Infrastructure Agent\\s+\\(installed\\)",
             "local_recipes": true
           }
         }