diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aaca0e58..53b886cd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v6
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 556fdbf6..baf2c7b7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
         id: go
       - name: Install Task
         uses: arduino/setup-task@v2
@@ -51,7 +51,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
         id: go
       - name: Install Task
         uses: arduino/setup-task@v2
@@ -73,24 +73,22 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        os:
-          - "ubuntu-latest"
-          - "windows-latest"
-        terraform:
-          - "1.9.*"
-          - "1.4.*"
-    runs-on: ${{ matrix.os }}
+        m:
+          - { os: "ubuntu-latest", terraform: "1.9.*" }
+          - { os: "ubuntu-latest", terraform: "1.4.*" }
+          - { os: "windows-latest", terraform: "1.9.*" }
+    runs-on: ${{ matrix.m.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
         id: go
       - uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: ${{ matrix.terraform }}
+          terraform_version: ${{ matrix.m.terraform }}
           terraform_wrapper: false
       - name: Get dependencies
         run: go mod download