2 files changed, 12 insertions, 11 deletions
diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile
index 42c4775f..a607f928 100644
--- a/docker/gradle/Dockerfile
+++ b/docker/gradle/Dockerfile
@@ -1,17 +1,17 @@
-FROM ubuntu:18.04 as downloader
+FROM ubuntu:20.04 as downloader
 
-ARG jdk=13
+ARG jdk=16
 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
 RUN provision/jdk/java-${jdk}.sh
 
 ARG lombokjar=lombok.jar
 ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
 
-ARG gradle=6.2.2
+ARG gradle=6.8.3
 ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
 RUN provision/gradle/gradle-${gradle}.sh
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 COPY --from=downloader /opt/gradle/ /opt/gradle/
 COPY --from=downloader /opt/jdk/ /opt/jdk/
@@ -26,7 +26,7 @@ ADD gradle/files/ ./
 COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar
 COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar
 
-ARG jdk=13
+ARG jdk=16
 ENV JDK_VERSION=${jdk}
 ENV JAVA_HOME=/opt/jdk
 ENV GRADLE_HOME=/opt/gradle/gradle
diff --git a/docker/gradle/readme.md b/docker/gradle/readme.md
index 71a7da8e..360dcf56 100644
--- a/docker/gradle/readme.md
+++ b/docker/gradle/readme.md
@@ -6,7 +6,8 @@
 
 The gradle version to be used. Supported values:
 
-- `6.2.2` (default)
+- `6.8.3` (default)
+- `6.2.2`
 - `6.0.1`
 - `5.6`
 - `5.1.1`
@@ -19,21 +20,21 @@ The gradle version to be used. Supported values:
 (To be executed from the `<lombokhome>/docker` directory)
 
 ```
-docker build -t lombok-gradle-jdk13 -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk16 -f gradle/Dockerfile .
 
-docker build -t lombok-gradle-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk16 --build-arg lombokjar=lombok-1.18.20.jar -f gradle/Dockerfile .
 ```
 
 ## Example run commands:
 
 ```
-docker run -it lombok-gradle-jdk13
+docker run -it lombok-gradle-jdk16
 
-docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/classpath/lombok.jar lombok-gradle-jdk13
+docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/classpath/lombok.jar lombok-gradle-jdk16
 ```
 
 ## Example container commands:
 
 ```
 gradle assemble
-```cd ...
+```