diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml
index 4116e6f..9575655 100644
--- a/.github/workflows/dev_builds.yml
+++ b/.github/workflows/dev_builds.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   setup-image:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
index e0708cb..021bfaf 100644
--- a/.github/workflows/pull_requests.yml
+++ b/.github/workflows/pull_requests.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   setup-image:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Build setup image
diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml
index 6367ca3..a0ee8d1 100644
--- a/.github/workflows/release_builds.yml
+++ b/.github/workflows/release_builds.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   setup-image:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/Dockerfile b/Dockerfile
index 1c36f32..7ff7ffc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM hashicorp/terraform:1.9.7 as terraform
+FROM hashicorp/terraform:1.10.5 as terraform
 
 FROM alpine:3.21.3
 
diff --git a/Dockerfile-ubi b/Dockerfile-ubi
index 2a846b9..a19a2d7 100644
--- a/Dockerfile-ubi
+++ b/Dockerfile-ubi
@@ -1,4 +1,4 @@
-FROM hashicorp/terraform:1.9.7 as terraform
+FROM hashicorp/terraform:1.10.5 as terraform
 
 FROM registry.access.redhat.com/ubi8/ubi:8.10