diff --git a/Dockerfile b/Dockerfile
index 771656bd..85b970e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/gitpod.Dockerfile b/gitpod.Dockerfile
index 7d030b6c..4131cf45 100644
--- a/gitpod.Dockerfile
+++ b/gitpod.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 
 # Install some basics
 RUN apt-get update \