diff --git a/Makefile b/Makefile
index c12919476..5ed3b08a3 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,7 @@ RUNTIME_TESTS_FLAKY_SHORT_CIRCUIT ?= true
 
 %-runtime-tests: load-runtimes_% $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME),--watchdog-action=panic --platform=systrap)
-	@IMAGE_TAG=$(call tag,$*) && \
+	@IMAGE_TAG=$(call tag,runtimes_$*) && \
 	$(call test_runtime_cached,$(RUNTIME),--test_timeout=1800 --test_env=RUNTIME_TESTS_FILTER=$(RUNTIME_TESTS_FILTER) --test_env=RUNTIME_TESTS_PER_TEST_TIMEOUT=$(RUNTIME_TESTS_PER_TEST_TIMEOUT) --test_env=RUNTIME_TESTS_RUNS_PER_TEST=$(RUNTIME_TESTS_RUNS_PER_TEST) --test_env=RUNTIME_TESTS_FLAKY_IS_ERROR=$(RUNTIME_TESTS_FLAKY_IS_ERROR) --test_env=RUNTIME_TESTS_FLAKY_SHORT_CIRCUIT=$(RUNTIME_TESTS_FLAKY_SHORT_CIRCUIT) --test_env=IMAGE_TAG=$${IMAGE_TAG} //test/runtimes:$*)
 
 do-tests: $(RUNTIME_BIN)
diff --git a/images/runtimes/java17/Dockerfile.x86_64 b/images/runtimes/java17/Dockerfile.x86_64
index 62635db48..1d5944693 100644
--- a/images/runtimes/java17/Dockerfile.x86_64
+++ b/images/runtimes/java17/Dockerfile.x86_64
@@ -1,4 +1,5 @@
 FROM ubuntu:bionic
+
 RUN apt-get update && apt-get install -y \
   autoconf \
   build-essential \