diff --git a/.devcontainer/default/devcontainer.json b/.devcontainer/default/devcontainer.json
index 7228ea08..502b7df6 100644
--- a/.devcontainer/default/devcontainer.json
+++ b/.devcontainer/default/devcontainer.json
@@ -9,7 +9,7 @@
 		},
 		"ghcr.io/devcontainers/features/github-cli:1": {},
 		"ghcr.io/robbert229/devcontainer-features/opentofu:1": {
-			"version": "1.12.1"
+			"version": "1.12.6"
 		}
 	},
 	"customizations": {
diff --git a/.devcontainer/withenvfile/devcontainer.json b/.devcontainer/withenvfile/devcontainer.json
index cc24a034..05fff6ea 100644
--- a/.devcontainer/withenvfile/devcontainer.json
+++ b/.devcontainer/withenvfile/devcontainer.json
@@ -9,7 +9,7 @@
 		},
 		"ghcr.io/devcontainers/features/github-cli:1": {},
 		"ghcr.io/robbert229/devcontainer-features/opentofu:1": {
-			"version": "1.12.1"
+			"version": "1.12.6"
 		}
 	},
 	"customizations": {
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 4fe710e1..cf5a8361 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -21,7 +21,7 @@ body:
     attributes:
       label: What version of the Terraform CLI are you using?
       description: What version of the Terraform CLI are you using?
-      placeholder: 1.15.0
+      placeholder: 1.16.1
     validations:
       required: true
   - type: input
diff --git a/.github/workflows/test-opentofu.yml b/.github/workflows/test-opentofu.yml
index 44a04098..36377a9a 100644
--- a/.github/workflows/test-opentofu.yml
+++ b/.github/workflows/test-opentofu.yml
@@ -48,12 +48,9 @@ jobs:
       matrix:
         # List of OpenTofu versions to be tested - last three versions are in scope
         # Check https://endoflife.date/opentofu for end of support dates
-        # '1.6.*' end of security support 09 Jan 2025
         opentofu:
-          - '1.7.*'
-          - '1.8.*'
-          - '1.9.*'
           - '1.10.*'
+          - '1.12.*'
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e
@@ -66,7 +63,7 @@ jobs:
           tofu_wrapper: false
       - run: go mod download
       - run: go test -v -timeout=900s -parallel=4 ./...
-        if: ${{ matrix.opentofu }} != ${{ env.LATEST_VERSION }}
+        if: ${{ matrix.opentofu != env.LATEST_VERSION }}
         env:
           TF_ACC: "1"
         timeout-minutes: 20
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 650a4613..57f893d2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ permissions:
 
 # Define the latest Terraform version to use for upload of coverage report
 env:
-  LATEST_VERSION: 1.15.*
+  LATEST_VERSION: 1.16.*
 
 jobs:
   # Ensure project builds before running testing matrix
@@ -103,10 +103,11 @@ jobs:
         # '1.10.*' end of security support 14 May 2025
         # '1.11.*' end of security support 20 Aug 2025
         # '1.12.*' end of security support 19 Nov 2025
+        # '1.13.*' end of security support 29 Apr 2026
         terraform:
-          - "1.13.*"
           - "1.14.*"
           - "1.15.*"
+          - "1.16.*"
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0