diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index cf4699e..1917d91 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Setup Java
       uses: actions/setup-java@v4
       with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: maven
 
diff --git a/.github/workflows/deploy-til-dev.yaml b/.github/workflows/deploy-til-dev.yaml
index a471c55..c2cc341 100644
--- a/.github/workflows/deploy-til-dev.yaml
+++ b/.github/workflows/deploy-til-dev.yaml
@@ -19,10 +19,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Run maven tests
@@ -37,10 +37,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ab6aaa..ed8e2af 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
@@ -36,10 +36,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/Dockerfile b/Dockerfile
index bc5ded0..13e1154 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
-FROM ghcr.io/navikt/poao-baseimages/java:17
+FROM ghcr.io/navikt/baseimages/temurin:21
 COPY /target/veilarboppgave.jar app.jar
diff --git a/pom.xml b/pom.xml
index dc8c246..94034d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
     <description>Backend applikasjon for oppgaver</description>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <common.version>3.2023.10.23_12.41-bafec3836d28</common.version>
     </properties>
 
@@ -79,6 +79,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.32</version>
             <optional>true</optional>
         </dependency>
         <dependency>