diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 0fd9a8f1..c6b38f88 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -13,11 +13,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
-      - uses: AdoptOpenJDK/install-jdk@v1
+      - name: Setup Java
+        uses: actions/setup-java@v2
         with:
-          version: '16'
-          architecture: x64
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Build with Maven
         run: ./mvnw clean package
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 47460e12..9e10f76b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -14,9 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: AdoptOpenJDK/install-jdk@v1
         with:
-          version: '16'
-          architecture: x64
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Build with Maven
         run: ./mvnw verify
diff --git a/Dockerfile b/Dockerfile
index fadcf395..9104256d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Builder image
-FROM adoptopenjdk/openjdk16:jdk-16.0.1_9-debian as build
+FROM eclipse-temurin:17_35-jdk@sha256:a576b23ab2bdcf3746b10ce9a83004798bf4d9bc9d62d926ffe2c987a7dd3c2b as build
 
 RUN jlink \
      --module-path /opt/java/jmods \
diff --git a/pom.xml b/pom.xml
index bf900828..40c7cb3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
-    <java.version>16</java.version>
+    <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <aws-java-sdk.version>1.12.78</aws-java-sdk.version>