diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml
index 7078877a..4d0e19cf 100644
--- a/.cloudbuild/cloudbuild-test-a.yaml
+++ b/.cloudbuild/cloudbuild-test-a.yaml
@@ -15,18 +15,16 @@
 timeout: 7200s # 2 hours
 substitutions:
   _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
-  _GRAALVM_A: 'graalvm22_3_jdk11'
-
 steps:
   # GraalVM A build
   - name: gcr.io/cloud-builders/docker
-    args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_A}.Dockerfile", "."]
+    args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."]
     dir: .cloudbuild
     id: graalvm-a-build
     waitFor: ["-"]
   - name: gcr.io/gcp-runtimes/structure_test
     args:
-      ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_A}.yaml", "-v"]
+      ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"]
     waitFor: ["graalvm-a-build"]
   - name: gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}
     entrypoint: bash
diff --git a/.cloudbuild/cloudbuild-test-b.yaml b/.cloudbuild/cloudbuild-test-b.yaml
index 816aa403..7bf193bc 100644
--- a/.cloudbuild/cloudbuild-test-b.yaml
+++ b/.cloudbuild/cloudbuild-test-b.yaml
@@ -15,18 +15,16 @@
 timeout: 7200s # 2 hours
 substitutions:
   _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
-  _GRAALVM_B: 'graalvm22_3_jdk17'
-
 steps:
   # GraalVM B build
   - name: gcr.io/cloud-builders/docker
-    args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_B}.Dockerfile", "."]
+    args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "."]
     dir: .cloudbuild
     id: graalvm-b-build
     waitFor: ["-"]
   - name: gcr.io/gcp-runtimes/structure_test
     args:
-      ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_B}.yaml", "-v"]
+      ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v"]
     waitFor: ["graalvm-b-build"]
   - name: gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}
     entrypoint: bash
diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml
index 1c9dbb6c..3b308072 100644
--- a/.cloudbuild/cloudbuild.yaml
+++ b/.cloudbuild/cloudbuild.yaml
@@ -15,29 +15,27 @@
 timeout: 7200s # 2 hours
 substitutions:
   _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
-  _GRAALVM_A: 'graalvm22_3_jdk11'
-  _GRAALVM_B: 'graalvm22_3_jdk17'
 steps:
   # GraalVM A build
   - name: gcr.io/cloud-builders/docker
-    args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_A}.Dockerfile", "."]
+    args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."]
     dir: .cloudbuild
     id: graalvm-a-build
     waitFor: ["-"]
   - name: gcr.io/gcp-runtimes/structure_test
     args:
-      ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_A}.yaml", "-v"]
+      ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"]
     waitFor: ["graalvm-a-build"]
 
   # GraalVM B build
   - name: gcr.io/cloud-builders/docker
-    args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_B}.Dockerfile", "." ]
+    args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "." ]
     dir: .cloudbuild
     id: graalvm-b-build
     waitFor: [ "-" ]
   - name: gcr.io/gcp-runtimes/structure_test
     args:
-      [ "-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_B}.yaml", "-v" ]
+      [ "-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v" ]
     waitFor: [ "graalvm-b-build" ]
 
 
diff --git a/.cloudbuild/graalvm22_3_jdk11.Dockerfile b/.cloudbuild/graalvm-a.Dockerfile
similarity index 100%
rename from .cloudbuild/graalvm22_3_jdk11.Dockerfile
rename to .cloudbuild/graalvm-a.Dockerfile
diff --git a/.cloudbuild/graalvm22_3_jdk11.yaml b/.cloudbuild/graalvm-a.yaml
similarity index 100%
rename from .cloudbuild/graalvm22_3_jdk11.yaml
rename to .cloudbuild/graalvm-a.yaml
diff --git a/.cloudbuild/graalvm22_3_jdk17.Dockerfile b/.cloudbuild/graalvm-b.Dockerfile
similarity index 100%
rename from .cloudbuild/graalvm22_3_jdk17.Dockerfile
rename to .cloudbuild/graalvm-b.Dockerfile
diff --git a/.cloudbuild/graalvm22_3_jdk17.yaml b/.cloudbuild/graalvm-b.yaml
similarity index 100%
rename from .cloudbuild/graalvm22_3_jdk17.yaml
rename to .cloudbuild/graalvm-b.yaml