diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index 4dec2a8..0e4c176 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -17,22 +17,24 @@ jobs:
         ATLANTIS:
           - 0.27.2
         TF_TG:
+          # Terraform 1.8.x
+          - 'TF-1.8.0    TG-0.57.0'
           # Terraform 1.7.x
-          - 'TF-1.7.5    TG-0.56.5'
+          - 'TF-1.7.5    TG-0.57.0'
           # Terraform 1.6.x
-          - 'TF-1.6.6    TG-0.56.5'
+          - 'TF-1.6.6    TG-0.57.0'
           # Terraform 1.5.x
-          - 'TF-1.5.7    TG-0.56.5'
+          - 'TF-1.5.7    TG-0.57.0'
           # Terraform 1.4.x
-          - 'TF-1.4.7    TG-0.56.5'
+          - 'TF-1.4.7    TG-0.57.0'
           # Terraform 1.3.x
-          - 'TF-1.3.10   TG-0.56.5'
+          - 'TF-1.3.10   TG-0.57.0'
           # Terraform 1.2.x
-          - 'TF-1.2.9    TG-0.56.5'
+          - 'TF-1.2.9    TG-0.57.0'
           # Terraform 1.1.x
-          - 'TF-1.1.9    TG-0.56.5'
+          - 'TF-1.1.9    TG-0.57.0'
           # Terraform 1.0.x
-          - 'TF-1.0.11   TG-0.56.5'
+          - 'TF-1.0.11   TG-0.57.0'
 
     steps:
       - name: Checkout repository
diff --git a/Makefile b/Makefile
index 2ba11bb..dc4d2e0 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ TAG = latest
 
 # Versions
 ATLANTIS = '0.27.2'
-TERRAFORM = '1.7.5'
-TERRAGRUNT = '0.56.3'
+TERRAFORM = '1.8.0'
+TERRAGRUNT = '0.57.0'
 TERRAGRUNT_ATLANTIS_CONFIG = '1.17.4'
 SOPS = '3.8.1'
 ONE_PASSWORD_CLI = '2.26.1'
diff --git a/README.md b/README.md
index 7d2249c..ce9381e 100644
--- a/README.md
+++ b/README.md
@@ -23,10 +23,10 @@ For building you can overwrite your desired versions with the following three Ma
 e.g.
 ```
 make build
-make build TERRAFORM=1.7.5
-make build TERRAFORM=1.7.5 TERRAGRUNT=0.56.5
-make build TERRAFORM=1.7.5 TERRAGRUNT=0.56.5 ATLANTIS=0.27.2
-make build TERRAFORM=1.7.5 TERRAGRUNT=0.56.5 ATLANTIS=0.27.2 SOPS=3.8.1
+make build TERRAFORM=1.8.0
+make build TERRAFORM=1.8.0 TERRAGRUNT=0.57.0
+make build TERRAFORM=1.8.0 TERRAGRUNT=0.57.0 ATLANTIS=0.27.2
+make build TERRAFORM=1.8.0 TERRAGRUNT=0.57.0 ATLANTIS=0.27.2 SOPS=3.8.1
 ```
 
 ## Available images