diff --git a/.github/workflows/packer.yml b/.github/workflows/packer.yml
new file mode 100644
index 00000000..69861efc
--- /dev/null
+++ b/.github/workflows/packer.yml
@@ -0,0 +1,32 @@
+name: Packer Validate
+
+on:
+  pull_request:
+    paths:
+      - packer/**
+
+env:
+  PACKER_VERSION: "1.8.7"
+
+jobs:
+  packer-validate:
+    runs-on: ubuntu-latest
+    name: Run Packer
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup packer
+        uses: hashicorp/setup-packer@main
+        id: setup
+        with:
+          version: ${{ env.PACKER_VERSION }}
+
+      - name: Validate Packer Templates
+        id: validate
+        working-directory: packer
+        run: |
+            for template in `ls | grep ".json"`; do
+                echo $template
+                packer validate $template
+            done
diff --git a/packer/jenkins-agent-al2-arm64.json b/packer/jenkins-agent-al2-arm64.json
index b4b22fd0..9d3515b1 100644
--- a/packer/jenkins-agent-al2-arm64.json
+++ b/packer/jenkins-agent-al2-arm64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-AL2-ARM64-JDK21",
+    "name-base":"Jenkins-Agent-AL2-ARM64",
     "os-version": "AL2",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-al2-x64.json b/packer/jenkins-agent-al2-x64.json
index ce6fa23d..3f2a156d 100644
--- a/packer/jenkins-agent-al2-x64.json
+++ b/packer/jenkins-agent-al2-x64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-AL2-X64-JDK21",
+    "name-base":"Jenkins-Agent-AL2-X64",
     "os-version": "AL2",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-al2023-arm64.json b/packer/jenkins-agent-al2023-arm64.json
index 1715aacc..74cbf0ff 100644
--- a/packer/jenkins-agent-al2023-arm64.json
+++ b/packer/jenkins-agent-al2023-arm64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-AL2023-ARM64-JDK21",
+    "name-base":"Jenkins-Agent-AL2023-ARM64",
     "os-version": "AL2023",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-al2023-x64.json b/packer/jenkins-agent-al2023-x64.json
index a1543c99..528e3bc2 100644
--- a/packer/jenkins-agent-al2023-x64.json
+++ b/packer/jenkins-agent-al2023-x64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-AL2023-X64-JDK21",
+    "name-base":"Jenkins-Agent-AL2023-X64",
     "os-version": "AL2023",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-macos12-x64.json b/packer/jenkins-agent-macos12-x64.json
index 33e28759..594d575f 100644
--- a/packer/jenkins-agent-macos12-x64.json
+++ b/packer/jenkins-agent-macos12-x64.json
@@ -1,6 +1,6 @@
 {
   "variables":{
-    "ami_name":"Jenkins-Agent-MacOS-X64-Mac1Metal-JDK21",
+    "ami_name":"Jenkins-Agent-MacOS-X64-Mac1Metal",
     "os_version": "12.4",
     "os_architecture": "x86_64_mac",
     "build-region":"us-east-1",
diff --git a/packer/jenkins-agent-ubuntu2004-x64.json b/packer/jenkins-agent-ubuntu2004-x64.json
index 11864024..65fa5873 100644
--- a/packer/jenkins-agent-ubuntu2004-x64.json
+++ b/packer/jenkins-agent-ubuntu2004-x64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-Ubuntu2004-X64-JDK21",
+    "name-base":"Jenkins-Agent-Ubuntu2004-X64",
     "os-version": "Ubuntu2004",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-win2019-x64-gradle-check.json b/packer/jenkins-agent-win2019-x64-gradle-check.json
index d4e84170..c153bbcd 100644
--- a/packer/jenkins-agent-win2019-x64-gradle-check.json
+++ b/packer/jenkins-agent-win2019-x64-gradle-check.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-Windows2019-X64-Gradle-Check-JDK21",
+    "name-base":"Jenkins-Agent-Windows2019-X64-Gradle-Check",
     "os-version": "Windows2019",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-win2019-x64.json b/packer/jenkins-agent-win2019-x64.json
index 10694396..d5d08a6f 100644
--- a/packer/jenkins-agent-win2019-x64.json
+++ b/packer/jenkins-agent-win2019-x64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-Windows2019-X64-JDK21",
+    "name-base":"Jenkins-Agent-Windows2019-X64",
     "os-version": "Windows2019",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",