diff --git a/kotlin-dev/Dockerfile b/kotlin-dev/Dockerfile
new file mode 100644
index 0000000..efdb6c6
--- /dev/null
+++ b/kotlin-dev/Dockerfile
@@ -0,0 +1,17 @@
+FROM git.luke-else.co.uk/luke-else/lab:latest
+
+RUN apk add --no-cache unzip openjdk21
+
+# Set Java environment variables
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
+ENV PATH="$JAVA_HOME/bin:$PATH"
+
+# Install SDKMAN and use it to install Kotlin and Gradle
+RUN curl -s "https://get.sdkman.io" | bash && \
+    bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && \
+             sdk install kotlin && \
+             sdk install gradle"
+
+# Make SDKMAN tools available in PATH
+ENV SDKMAN_DIR="/root/.sdkman"
+ENV PATH="$SDKMAN_DIR/candidates/kotlin/current/bin:$SDKMAN_DIR/candidates/gradle/current/bin:$PATH"
\ No newline at end of file
diff --git a/kotlin/Dockerfile b/kotlin/Dockerfile
new file mode 100644
index 0000000..f54eecb
--- /dev/null
+++ b/kotlin/Dockerfile
@@ -0,0 +1,17 @@
+FROM git.luke-else.co.uk/luke-else/base:latest
+
+RUN apk add --no-cache unzip openjdk21
+
+# Set Java environment variables
+ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk
+ENV PATH="$JAVA_HOME/bin:$PATH"
+
+# Install SDKMAN and use it to install Kotlin and Gradle
+RUN curl -s "https://get.sdkman.io" | bash && \
+    bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && \
+             sdk install kotlin && \
+             sdk install gradle"
+
+# Make SDKMAN tools available in PATH
+ENV SDKMAN_DIR="/root/.sdkman"
+ENV PATH="$SDKMAN_DIR/candidates/kotlin/current/bin:$SDKMAN_DIR/candidates/gradle/current/bin:$PATH"
\ No newline at end of file