diff --git a/README.md b/README.md
index 9314f70ce2f7cc7e29aa5849a66dca778a1fb867..a3b0c2ab6e2fb0f3a44df72d4a28ea1b1f874374 100644
--- a/README.md
+++ b/README.md
@@ -219,6 +219,7 @@ beautifully renders the inputs for each templates - check it out!
 
 The following OpenTofu versions are available with this component via the `opentofu_version` input:
 
+- [`1.8.4`](https://github.com/opentofu/opentofu/releases/tag/v1.8.4)
 - [`1.8.3`](https://github.com/opentofu/opentofu/releases/tag/v1.8.3)
 - [`1.8.2`](https://github.com/opentofu/opentofu/releases/tag/v1.8.2)
 - [`1.8.1`](https://github.com/opentofu/opentofu/releases/tag/v1.8.1)
diff --git a/default.json b/default.json
index 27e39a3a80f76f1685778e80ab4bc986fd1ccab8..aa201429927b40d858ba403121f2e430d86aa471 100644
--- a/default.json
+++ b/default.json
@@ -12,7 +12,7 @@
                 "templates/**/*.yml",
                 "templates/**/*.yaml"
             ],
-            "allowedVersions": "<=1.8.3"
+            "allowedVersions": "<=1.8.4"
         }
     ],
     "customManagers": [
diff --git a/opentofu_versions.yaml b/opentofu_versions.yaml
index e2c504c6f5f41ec689e0f9ba4a9e274c34a5ad0e..5e933af4a2279b3014faa386bb78b04886cad06f 100644
--- a/opentofu_versions.yaml
+++ b/opentofu_versions.yaml
@@ -1,6 +1,7 @@
 .data:
-  latest_version: '1.8.3'
+  latest_version: '1.8.4'
   supported_versions: &supported_versions
+    - '1.8.4'
     - '1.8.3'
     - '1.8.2'
     - '1.8.1'
diff --git a/templates/apply.yml b/templates/apply.yml
index 691c949cc202b6d58b865b11d1ff44992602dfb8..8e992063958c257a6aea4a48a06410d75a8d5ec3 100644
--- a/templates/apply.yml
+++ b/templates/apply.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/custom-command.yml b/templates/custom-command.yml
index b7107a1b0c993cb5082cc6ab42168ac7841756e4..8d705aba957614e7d2ef7fe9a07cab1d879184da 100644
--- a/templates/custom-command.yml
+++ b/templates/custom-command.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/destroy.yml b/templates/destroy.yml
index b485b4318207b78c0224d73f32fc73a7d4552dd1..a224964ec478526ea562430b6bbfaaf75c64e67f 100644
--- a/templates/destroy.yml
+++ b/templates/destroy.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/fmt.yml b/templates/fmt.yml
index 10db81f02246629609ed1bdda15a1ad52a53ae85..45219cc325b472a47355d00662ffa710804be5d5 100644
--- a/templates/fmt.yml
+++ b/templates/fmt.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml
index fe7e72c415b0c1d5df6d693b69ef9d38a06b3c7b..fece43f4514dc7dad952125cf4e74275c4b0605d 100644
--- a/templates/full-pipeline.yml
+++ b/templates/full-pipeline.yml
@@ -33,8 +33,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/graph.yml b/templates/graph.yml
index b7966fe5d0a0aeb3548986caf60a337dccef966f..fa6c21f390f972c807616421aa1b1816a8a98a70 100644
--- a/templates/graph.yml
+++ b/templates/graph.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/job-templates.yml b/templates/job-templates.yml
index 822c9e07d81d1fd17f7497dd895cfd6487433af2..93ced344df0cfe0f40dcdbec26adb8cc04e518e4 100644
--- a/templates/job-templates.yml
+++ b/templates/job-templates.yml
@@ -33,8 +33,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/plan.yml b/templates/plan.yml
index ce0f646986e5b3fd827d81010c39ef83ebfb7591..a62a5465dbb6cf2f097be34c7099508b5f40a965 100644
--- a/templates/plan.yml
+++ b/templates/plan.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/test.yml b/templates/test.yml
index 55cfa1d931d12f154cb448ee7c3b6ef437b04fb2..37e659a6ec906bff6600278d8c9de35a4c4f1f2f 100644
--- a/templates/test.yml
+++ b/templates/test.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml
index ce0cdcd60ca682c82b44b5dcaa5313babf731b01..a48b5522866a6a660d0d4f1aebe16c0999569ab6 100644
--- a/templates/validate-plan-apply.yml
+++ b/templates/validate-plan-apply.yml
@@ -27,8 +27,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/validate-plan-destroy.yml b/templates/validate-plan-destroy.yml
index fcc0b0d559fedca7eec91a0db93865b9bb53c198..ac01f065ade6afd4bef607d2f0ff77c8fd60e9a7 100644
--- a/templates/validate-plan-destroy.yml
+++ b/templates/validate-plan-destroy.yml
@@ -27,8 +27,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/validate-plan.yml b/templates/validate-plan.yml
index d42b965d5045888a5d2210712fd969f7eb937646..69fe8cc9731eea1d11c8edfa4e09192c9e2ecd9f 100644
--- a/templates/validate-plan.yml
+++ b/templates/validate-plan.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'
diff --git a/templates/validate.yml b/templates/validate.yml
index a06ee9b418f52e6df8e6ddb17655312ba8adbcee..fb096b2a187719988e8154f3ca9495b624eb0d77 100644
--- a/templates/validate.yml
+++ b/templates/validate.yml
@@ -24,8 +24,9 @@ spec:
       description: 'Base OS of GitLab OpenTofu image.'
 
     opentofu_version:
-      default: '1.8.3'
+      default: '1.8.4'
       options:
+        - '1.8.4'
         - '1.8.3'
         - '1.8.2'
         - '1.8.1'