diff --git a/.github/workflows/compare-snapshots.yml b/.github/workflows/compare-snapshots.yml
index e83371a5bd..9afe26f97b 100644
--- a/.github/workflows/compare-snapshots.yml
+++ b/.github/workflows/compare-snapshots.yml
@@ -18,10 +18,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
+      - name: Determine Go version
+        id: go
+        uses: ./.github/actions/go-version
 
-      - name: Install Go
+      - name: Set up Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
-        with: { go-version: '1.21.3' }
+        with:
+          go-version: ${{ steps.go.outputs.version }}
 
       - name: Get the equivalence test binary
         run: |
diff --git a/.go-version b/.go-version
index 88863fd8e3..229a27c6f2 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.11
+1.22.8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88d4e6852b..8afcd65b51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 1.8.6 (unreleased)
 
+ENHANCEMENTS:
+
+* OpenTofu builds now use Go version 1.22 ([#2050](https://github.com/opentofu/opentofu/issues/2050))
 
 ## 1.8.5
 
diff --git a/go.mod b/go.mod
index 7f07f108c4..5ed0201326 100644
--- a/go.mod
+++ b/go.mod
@@ -266,6 +266,6 @@ require (
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
 
-go 1.21
+go 1.22
 
 replace github.com/hashicorp/hcl/v2 v2.20.1 => github.com/opentofu/hcl/v2 v2.0.0-20240416130056-03228b26f391