diff --git a/integrations/docker/images/chip-build-java/Dockerfile b/integrations/docker/images/chip-build-java/Dockerfile
new file mode 100644
index 00000000000000..5411af497c6a18
--- /dev/null
+++ b/integrations/docker/images/chip-build-java/Dockerfile
@@ -0,0 +1,13 @@
+ARG VERSION=latest
+FROM connectedhomeip/chip-build:${VERSION}
+
+# Download and install kotlin compiler
+RUN set -x \
+    && cd /usr/lib \
+    && wget -q https://github.com/JetBrains/kotlin/releases/download/v1.3.31/kotlin-compiler-1.3.31.zip \
+    && unzip kotlin-compiler-*.zip \
+    && rm kotlin-compiler-*.zip \
+    && rm -f kotlinc/bin/*.bat \
+    && : # last line
+
+ENV PATH $PATH:/usr/lib/kotlinc/bin
diff --git a/integrations/docker/images/chip-build-java/build.sh b/integrations/docker/images/chip-build-java/build.sh
new file mode 120000
index 00000000000000..fcb4d4ee75d531
--- /dev/null
+++ b/integrations/docker/images/chip-build-java/build.sh
@@ -0,0 +1 @@
+../../build.sh
\ No newline at end of file
diff --git a/integrations/docker/images/chip-build-java/run.sh b/integrations/docker/images/chip-build-java/run.sh
new file mode 120000
index 00000000000000..ccbd3501b330d9
--- /dev/null
+++ b/integrations/docker/images/chip-build-java/run.sh
@@ -0,0 +1 @@
+../../run.sh
\ No newline at end of file
diff --git a/integrations/docker/images/chip-build-java/version b/integrations/docker/images/chip-build-java/version
new file mode 120000
index 00000000000000..a4280acd348e7f
--- /dev/null
+++ b/integrations/docker/images/chip-build-java/version
@@ -0,0 +1 @@
+../chip-build/version
\ No newline at end of file
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
index 23c7a37058594e..213e93d04465d2 100644
--- a/integrations/docker/images/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -61,6 +61,17 @@ RUN set -x \
     && chmod -R a+w /opt/android/sdk/licenses \
     && : # last line
 
+# Download and install kotlin compiler
+RUN set -x \
+    && cd /usr/lib \
+    && wget -q https://github.com/JetBrains/kotlin/releases/download/v1.3.31/kotlin-compiler-1.3.31.zip \
+    && unzip kotlin-compiler-*.zip \
+    && rm kotlin-compiler-*.zip \
+    && rm -f kotlinc/bin/*.bat \
+    && : # last line
+
+ENV PATH $PATH:/usr/lib/kotlinc/bin
+
 # Required for the Tizen SDK
 RUN set -x \
     && apt-get update \
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 17db6c29ba4e7a..e60589f4fac21d 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.6.41 Version bump reason: [K32W0] SDK 2.6.10 update
+0.6.42 Version bump reason: [Java] download and install kotlin compiler