diff --git a/.buildkite/linux_jdk_matrix_pipeline.yml b/.buildkite/linux_jdk_matrix_pipeline.yml
index 9c5364d03..9315c924d 100644
--- a/.buildkite/linux_jdk_matrix_pipeline.yml
+++ b/.buildkite/linux_jdk_matrix_pipeline.yml
@@ -19,8 +19,6 @@ steps:
             value: "ubuntu-2204"
           - label: "Ubuntu 20.04"
             value: "ubuntu-2004"
-          - label: "Ubuntu 18.04"
-            value: "ubuntu-1804"
           - label: "Debian 11"
             value: "debian-11"
           - label: "Debian 10"
diff --git a/.buildkite/scripts/common/vm-images.json b/.buildkite/scripts/common/vm-images.json
index 45a7fbb1c..698bf1a64 100644
--- a/.buildkite/scripts/common/vm-images.json
+++ b/.buildkite/scripts/common/vm-images.json
@@ -1,7 +1,7 @@
 {
     "#comment": "This file lists all custom vm images. We use it to make decisions about randomized CI jobs.",
     "linux": {
-        "ubuntu": ["ubuntu-2204", "ubuntu-2004", "ubuntu-1804"],
+        "ubuntu": ["ubuntu-2204", "ubuntu-2004"],
         "debian": ["debian-11", "debian-10"],
         "rhel": ["rhel-9", "rhel-8"],
         "oraclelinux": ["oraclelinux-8", "oraclelinux-7"],