diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e59a55a0..5f8da353 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,11 +37,11 @@ jobs:
             org.opencontainers.image.title=feasibility backend
             org.opencontainers.image.description=Provides backend functions for feasibility UI including query execution
 
-      - name: Set up JDK 17
+      - name: Set up JDK 22
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 22
 
       - name: Cache Local Maven Repo
         uses: actions/cache@v4
@@ -205,11 +205,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+    - name: Set up JDK 22
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 22
 
     - name: Cache Local Maven Repo
       uses: actions/cache@v4
diff --git a/Dockerfile b/Dockerfile
index 5bf2b1f2..ae7983d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,6 @@
 FROM eclipse-temurin:22-jre@sha256:26bd835ee107ae775d85f1ff8c55abc799f514fb4201e65981857041d18826c1
 
-RUN apt-get update -yqq && apt-get upgrade -yqq && \
-    apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/
-
 WORKDIR /opt/dataportal-backend
-COPY ./target/*.jar ./dataportal-backend.jar
-COPY ontology ontology
 
 ARG VERSION=6.0.0
 ENV APP_VERSION=${VERSION}
@@ -25,5 +20,8 @@ USER 10001
 
 HEALTHCHECK --interval=5s --start-period=10s CMD curl -s -f http://localhost:8090/actuator/health || exit 1
 
+COPY ./target/*.jar ./dataportal-backend.jar
+COPY ontology ontology
 COPY ./docker-entrypoint.sh /
+
 ENTRYPOINT ["/bin/bash", "/docker-entrypoint.sh"]
\ No newline at end of file