diff --git a/frontend/src/components/icps/AgentForm.tsx b/frontend/src/components/icps/AgentForm.tsx
index 2c227fa6..41ecc93b 100644
--- a/frontend/src/components/icps/AgentForm.tsx
+++ b/frontend/src/components/icps/AgentForm.tsx
@@ -168,6 +168,10 @@ const stackList = [
   { value: "SailPoint", label: "SailPoint" },
   { value: "Okta", label: "Okta" },
   { value: "Auth0", label: "Auth0" },
+  { value: "AWS", label: "AWS" },
+  { value: "Grafana", label: "Grafana" },
+  { value: "Prometheus", label: "Prometheus" },
+  { value: "Sentry", label: "Sentry" },
 ]
 stackList.sort((a, b) => a.label.localeCompare(b.label))
 
diff --git a/src/app/domain/jobs/utils.py b/src/app/domain/jobs/utils.py
index 118a1c30..37daaf24 100644
--- a/src/app/domain/jobs/utils.py
+++ b/src/app/domain/jobs/utils.py
@@ -55,6 +55,10 @@
     "SailPoint",
     "Okta",
     "Auth0",
+    "AWS",
+    "Grafana",
+    "Prometheuse",
+    "Sentry",
 ]
 
 tool_name_special_cases = {