diff --git a/PrimeBASIC/solution_1/Dockerfile b/PrimeBASIC/solution_1/Dockerfile
index b7319d6f8..775e8c106 100644
--- a/PrimeBASIC/solution_1/Dockerfile
+++ b/PrimeBASIC/solution_1/Dockerfile
@@ -1,11 +1,11 @@
-FROM primeimages/freebasic:1.07.3 AS build
+FROM primeimages/freebasic:1.10.1 AS build
 
 WORKDIR /opt/app
 COPY *.bas *.sh ./
 
 RUN find . -name 'prime_*.bas' -exec fbc {} -x {}.run \;
 
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 WORKDIR /opt/app
 COPY --from=build /opt/app/*run* ./
 
diff --git a/PrimeIDL/solution_1/Dockerfile b/PrimeIDL/solution_1/Dockerfile
index dd06d056a..1fbbea8ec 100644
--- a/PrimeIDL/solution_1/Dockerfile
+++ b/PrimeIDL/solution_1/Dockerfile
@@ -1,4 +1,4 @@
-FROM primeimages/gdl:1.0.0-rc3
+FROM primeimages/gdl:1.0.4
 
 WORKDIR /opt/app
 
diff --git a/PrimePascal/solution_1/Dockerfile b/PrimePascal/solution_1/Dockerfile
index eebc58588..7fbca1d76 100644
--- a/PrimePascal/solution_1/Dockerfile
+++ b/PrimePascal/solution_1/Dockerfile
@@ -1,11 +1,11 @@
-FROM primeimages/freepascal:3.2.0 AS build
+FROM primeimages/freepascal:3.2.2 AS build
 
 WORKDIR /opt/app
 COPY *.pas .
 
 RUN fpc prime -O3
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 COPY --from=build /opt/app/prime /opt/app/
 
 ENTRYPOINT [ "/opt/app/prime" ]
\ No newline at end of file
diff --git a/PrimePascal/solution_2/Dockerfile b/PrimePascal/solution_2/Dockerfile
index 0af1b1aa7..cc0a179b2 100644
--- a/PrimePascal/solution_2/Dockerfile
+++ b/PrimePascal/solution_2/Dockerfile
@@ -1,11 +1,11 @@
-FROM primeimages/freepascal:3.2.0 AS build
+FROM primeimages/freepascal:3.2.2 AS build
 
 WORKDIR /opt/app
 COPY *.pas .
 
 RUN fpc prime
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 COPY --from=build /opt/app/prime /opt/app/
 
 ENTRYPOINT [ "/opt/app/prime" ]
\ No newline at end of file
diff --git a/PrimePascal/solution_3/Dockerfile b/PrimePascal/solution_3/Dockerfile
index 4f40ca52d..926972c63 100644
--- a/PrimePascal/solution_3/Dockerfile
+++ b/PrimePascal/solution_3/Dockerfile
@@ -1,11 +1,11 @@
-FROM primeimages/freepascal:3.2.0 AS build
+FROM primeimages/freepascal:3.2.2 AS build
 
 WORKDIR /opt/app
 COPY *.pas run.sh ./
 
 RUN fpc PrimePas -O3 -v0
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 WORKDIR /opt/app
 COPY --from=build /opt/app/PrimePas /opt/app/run.sh /opt/app/