diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
index 1a7151b..ee97e04 100755
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -490,10 +490,10 @@
         "always-pull": False,
     },
     "kythe_ubuntu2004": {
-        "name": "Kythe (Ubuntu 20.04 LTS, OpenJDK 11, gcc 9.4.0)",
-        "emoji-name": "Kythe (:ubuntu: 20.04 LTS, OpenJDK 11, gcc 9.4.0)",
+        "name": "Kythe (Ubuntu 20.04 LTS)",
+        "emoji-name": "Kythe (:ubuntu: Ubuntu 20.04 LTS)",
         "publish_binary": [],
-        "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu2004-java11-kythe",
+        "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu2004-kythe",
         "python": "python3.8",
     },
     "ubuntu2204_java17": {
diff --git a/buildkite/docker/build.sh b/buildkite/docker/build.sh
index 24e5629..84e4cbb 100755
--- a/buildkite/docker/build.sh
+++ b/buildkite/docker/build.sh
@@ -38,6 +38,6 @@
 docker build -f ubuntu1604/Dockerfile --target ubuntu1604-bazel-java8      -t "gcr.io/$PREFIX/ubuntu1604-bazel-java8" ubuntu1604
 docker build -f ubuntu1804/Dockerfile --target ubuntu1804-bazel-java11     -t "gcr.io/$PREFIX/ubuntu1804-bazel-java11" ubuntu1804
 docker build -f ubuntu2004/Dockerfile --target ubuntu2004-bazel-java11     -t "gcr.io/$PREFIX/ubuntu2004-bazel-java11" ubuntu2004
-docker build -f ubuntu2004/Dockerfile --target ubuntu2004-java11-kythe     -t "gcr.io/$PREFIX/ubuntu2004-java11-kythe" ubuntu2004
+docker build -f ubuntu2004/Dockerfile --target ubuntu2004-kythe            -t "gcr.io/$PREFIX/ubuntu2004-kythe" ubuntu2004
 docker build -f ubuntu2204/Dockerfile --target ubuntu2204-bazel-java17     -t "gcr.io/$PREFIX/ubuntu2204-bazel-java17" ubuntu2204
 docker build -f fedora39/Dockerfile   --target fedora39-bazel-java17       -t "gcr.io/$PREFIX/fedora39-bazel-java17" fedora39
diff --git a/buildkite/docker/push.sh b/buildkite/docker/push.sh
index 2003d80..0da1935 100755
--- a/buildkite/docker/push.sh
+++ b/buildkite/docker/push.sh
@@ -28,7 +28,7 @@
 docker push "gcr.io/$PREFIX/ubuntu1804-java11" &
 docker push "gcr.io/$PREFIX/ubuntu2004-bazel-java11" &
 docker push "gcr.io/$PREFIX/ubuntu2004-java11" &
-docker push "gcr.io/$PREFIX/ubuntu2004-java11-kythe" &
+docker push "gcr.io/$PREFIX/ubuntu2004-kythe" &
 docker push "gcr.io/$PREFIX/ubuntu2004" &
 docker push "gcr.io/$PREFIX/ubuntu2204-java17" &
 docker push "gcr.io/$PREFIX/ubuntu2204-bazel-java17" &