diff --git a/Dockerfile.java b/Dockerfile.java
new file mode 100644
index 0000000..95e0271
--- /dev/null
+++ b/Dockerfile.java
@@ -0,0 +1,4 @@
+FROM git.staropensource.de/staropensource/actions-docker:latest
+
+# Install latest OpenJDK release
+RUN pacman -S --noconfirm jdk-openjdk
diff --git a/Makefile b/Makefile
index 00279ec..2e85c0e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,5 +4,7 @@ help:
 	@echo "     upload  Builds and uploads the image"
 build:
 	docker buildx build -t git.staropensource.de/staropensource/actions-docker:latest -f Dockerfile .
+	docker buildx build -t git.staropensource.de/staropensource/actions-docker:java -f Dockerfile.java .
 upload: build
 	docker push git.staropensource.de/staropensource/actions-docker:latest
+	docker push git.staropensource.de/staropensource/actions-docker:java