diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 517ca2f5..0bebecb7 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -43,7 +43,7 @@ jobs:
 
   test-integration-nix:
     name: Run integration tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Login to DockerHub
@@ -56,7 +56,7 @@ jobs:
 
   snyk:
     name: Run security checks via snyk
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Login to DockerHub
@@ -94,7 +94,7 @@ jobs:
 
   test-build:
     name: Test binary compilation for all platforms:arch
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -108,7 +108,7 @@ jobs:
 
   test-e2e:
     name: Run e2e tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Login to DockerHub
@@ -126,7 +126,7 @@ jobs:
   finish:
     name: Finish
     needs: [ test-nix, test-windows ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Coveralls Finished
         uses: coverallsapp/github-action@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d60844e..c679566c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
 
   test-integration-nix:
     name: Run integration tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Login to DockerHub
@@ -53,7 +53,7 @@ jobs:
 
   snyk:
     name: Run security checks via snyk
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Login to DockerHub
@@ -93,7 +93,7 @@ jobs:
 
   prerelease:
     name: Build and release binaries
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [ test-nix, test-windows, snyk, test-integration-nix ]
     steps:
       - uses: actions/checkout@v2
@@ -115,7 +115,7 @@ jobs:
   finish:
     name: Finish
     needs: [ prerelease ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Coveralls Finished
         uses: coverallsapp/github-action@v2
diff --git a/build/Dockerfile b/build/Dockerfile
index f3644da9..cd3dd65d 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,5 +1,5 @@
 # Use Ubuntu 16.04 as the base image
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 
 # Define Go version
 ARG GO_VERSION=1.22