diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e5a4ff..d2c53f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.6.7] - 2024-03-25
+
+### Changed
+- Upgrade Go to 1.22 (CONJSE-1842)
+
 ## [0.6.6] - 2023-06-21
 ### Security
 - Updated golang.org/x/sys to v0.8.0 and golang.org/x/text to v0.9.0
diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser
index fb3a238..e1b20f6 100644
--- a/Dockerfile.goreleaser
+++ b/Dockerfile.goreleaser
@@ -11,5 +11,9 @@ FROM goreleaser/goreleaser
 ADD build_ca_certificate /usr/local/share/ca-certificates/
 RUN update-ca-certificates
 
+# Use newer version of Go if version in go.mod is higher
+# than the one in the goreleaser image
+ENV GOTOOLCHAIN=auto
+
 # Workaround for CVE-2022-24765 when running git inside a docker container
 RUN git config --global --add safe.directory /terraform-provider-conjur
diff --git a/bin/build b/bin/build
index e4003d2..c273895 100755
--- a/bin/build
+++ b/bin/build
@@ -38,7 +38,7 @@ build_and_package_binaries() {
   echo "> Building and packaging binaries"
   docker compose run --rm \
     --entrypoint goreleaser \
-    goreleaser release --rm-dist --skip-validate
+    goreleaser release --clean --skip=validate
 
   # Needed for testing stages
   goos='linux'  # uname -s | tr '[:upper:]' '[:lower:]'
diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
index 5f8942f..044638a 100644
--- a/demo/docker-compose.yml
+++ b/demo/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   conjur:
     image: registry.tld/conjur-appliance-cuke-master:5.0-stable
@@ -9,7 +8,7 @@ services:
       - "4443:443"
 
 #  cli:
-#    image: cyberark/conjur-cli:5
+#    image: cyberark/conjur-cli:8
 #    volumes:
 #      - .:/demo
       
diff --git a/docker-compose.enterprise.yml b/docker-compose.enterprise.yml
index d121218..718d6bd 100644
--- a/docker-compose.enterprise.yml
+++ b/docker-compose.enterprise.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   conjur-server:
     image: registry.tld/conjur-appliance:5.0-stable
diff --git a/docker-compose.oss.yml b/docker-compose.oss.yml
index c4eab9f..c894e78 100644
--- a/docker-compose.oss.yml
+++ b/docker-compose.oss.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   database:
     image: postgres:10
diff --git a/docker-compose.yml b/docker-compose.yml
index e0ed1d1..e0831fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   client:
     image: cyberark/conjur-cli:5
diff --git a/go.mod b/go.mod
index a927085..9f7c1ca 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,7 @@
 module github.com/cyberark/terraform-provider-conjur
 
+go 1.22.1
+
 require (
 	github.com/cyberark/conjur-api-go v0.10.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.23.0
@@ -49,8 +51,6 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
-go 1.19
-
 // Security fixes to ensure we don't have old vulnerable packages in our
 // dependency tree. We're often not vulnerable, but removing them to ensure
 // we never end up selecting them when other dependencies change.