diff --git a/.brev/setup.sh b/.brev/setup.sh
index 94015d7e..4d180524 100755
--- a/.brev/setup.sh
+++ b/.brev/setup.sh
@@ -74,8 +74,8 @@ append_if_not_exist ". \$HOME/.asdf/asdf.sh" ~/.zshrc
 
 # golang
 asdf plugin add golang https://github.com/asdf-community/asdf-golang.git
-asdf install golang 1.21.8
-asdf global golang 1.21.8
+asdf install golang 1.22.6
+asdf global golang 1.22.6
 asdf install
 GO_VERSION=$(asdf current golang | awk '{print $2}')
 GO_ROOT=$HOME/.asdf/installs/golang/$GO_VERSION/go
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e3c5ac62..6c80f1db 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21
+FROM golang:1.22.6
 
 # [Option] Install zsh
 ARG INSTALL_ZSH="true"
diff --git a/.github/workflows/Test_CanClonePublicRepoWithoutAuthorizeddKeysAllFormats.yml b/.github/workflows/Test_CanClonePublicRepoWithoutAuthorizeddKeysAllFormats.yml
index 1fb3ae87..2a8ada05 100644
--- a/.github/workflows/Test_CanClonePublicRepoWithoutAuthorizeddKeysAllFormats.yml
+++ b/.github/workflows/Test_CanClonePublicRepoWithoutAuthorizeddKeysAllFormats.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ChangePwd.yml b/.github/workflows/Test_ChangePwd.yml
index cc1dda81..37e45d5f 100644
--- a/.github/workflows/Test_ChangePwd.yml
+++ b/.github/workflows/Test_ChangePwd.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_CustomBranchCustomSetupCustomFolder.yml b/.github/workflows/Test_CustomBranchCustomSetupCustomFolder.yml
index b5a0a08e..0d16510a 100644
--- a/.github/workflows/Test_CustomBranchCustomSetupCustomFolder.yml
+++ b/.github/workflows/Test_CustomBranchCustomSetupCustomFolder.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true     
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_NoProjectBrev.yml b/.github/workflows/Test_NoProjectBrev.yml
index c35d09e4..7aa7cc75 100644
--- a/.github/workflows/Test_NoProjectBrev.yml
+++ b/.github/workflows/Test_NoProjectBrev.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_NoUserBrevNoProj.yml b/.github/workflows/Test_NoUserBrevNoProj.yml
index cf298f6b..392a2a5f 100644
--- a/.github/workflows/Test_NoUserBrevNoProj.yml
+++ b/.github/workflows/Test_NoUserBrevNoProj.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_NoUserBrevProj.yml b/.github/workflows/Test_NoUserBrevProj.yml
index 8c0a8e75..804f9adc 100644
--- a/.github/workflows/Test_NoUserBrevProj.yml
+++ b/.github/workflows/Test_NoUserBrevProj.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ProjectRepoNoBrev.yml b/.github/workflows/Test_ProjectRepoNoBrev.yml
index 4d094916..d5ee98de 100644
--- a/.github/workflows/Test_ProjectRepoNoBrev.yml
+++ b/.github/workflows/Test_ProjectRepoNoBrev.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ProvidedSetupFileChange.yml b/.github/workflows/Test_ProvidedSetupFileChange.yml
index 079b7c79..2e2ebd91 100644
--- a/.github/workflows/Test_ProvidedSetupFileChange.yml
+++ b/.github/workflows/Test_ProvidedSetupFileChange.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ProvidedSetupRanNoProj.yml b/.github/workflows/Test_ProvidedSetupRanNoProj.yml
index 14c1edd6..f9406275 100644
--- a/.github/workflows/Test_ProvidedSetupRanNoProj.yml
+++ b/.github/workflows/Test_ProvidedSetupRanNoProj.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ProvidedSetupUpdated.yml b/.github/workflows/Test_ProvidedSetupUpdated.yml
index b12b904d..b9cb9867 100644
--- a/.github/workflows/Test_ProvidedSetupUpdated.yml
+++ b/.github/workflows/Test_ProvidedSetupUpdated.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true     
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_UnauthenticatedSSHKey.yml b/.github/workflows/Test_UnauthenticatedSSHKey.yml
index 11f9e0b8..b6a2bb73 100644
--- a/.github/workflows/Test_UnauthenticatedSSHKey.yml
+++ b/.github/workflows/Test_UnauthenticatedSSHKey.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_UserBrevProjectBrevV0.yml b/.github/workflows/Test_UserBrevProjectBrevV0.yml
index 4e437a5c..dca13a66 100644
--- a/.github/workflows/Test_UserBrevProjectBrevV0.yml
+++ b/.github/workflows/Test_UserBrevProjectBrevV0.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_UserBrevProjectBrevV1All.yml b/.github/workflows/Test_UserBrevProjectBrevV1All.yml
index 4a1b726f..562ee8e4 100644
--- a/.github/workflows/Test_UserBrevProjectBrevV1All.yml
+++ b/.github/workflows/Test_UserBrevProjectBrevV1All.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_UserBrevProjectBrevV1Minimal.yml b/.github/workflows/Test_UserBrevProjectBrevV1Minimal.yml
index feddb212..d7b8b90c 100644
--- a/.github/workflows/Test_UserBrevProjectBrevV1Minimal.yml
+++ b/.github/workflows/Test_UserBrevProjectBrevV1Minimal.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_VscodeExtension.yml b/.github/workflows/Test_VscodeExtension.yml
index bfbe8c30..fa2bfdc7 100644
--- a/.github/workflows/Test_VscodeExtension.yml
+++ b/.github/workflows/Test_VscodeExtension.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_httpGit.yml b/.github/workflows/Test_httpGit.yml
index aa534030..9d95ccd8 100644
--- a/.github/workflows/Test_httpGit.yml
+++ b/.github/workflows/Test_httpGit.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 35c0e26a..101c1f39 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true
 
       - name: Build
diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
index e2b3eb39..22f6c5d3 100644
--- a/.github/workflows/fmt.yml
+++ b/.github/workflows/fmt.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true
 
 
diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml
index 11ec6588..ecd4fdd5 100644
--- a/.github/workflows/legacy.yml
+++ b/.github/workflows/legacy.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true
       - name: Build
         run: make ci
@@ -62,7 +62,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true
       - name: Release test
         run: make build
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7dcc3651..a2d4e1dc 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true
       - name: install
         run: make install
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f34c9046..7d8ed44b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true
       - name: Release
         run: make ci smoke-test release
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de505bae..76064f29 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true
       - name: install
         run: make install
diff --git a/.github/workflows/vet.yml b/.github/workflows/vet.yml
index 100c64fe..109a86e8 100644
--- a/.github/workflows/vet.yml
+++ b/.github/workflows/vet.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true
       - name: install
         run: make install
diff --git a/.tool-versions b/.tool-versions
deleted file mode 100644
index 9264d463..00000000
--- a/.tool-versions
+++ /dev/null
@@ -1 +0,0 @@
-golang 1.21.8
diff --git a/bin/gen-e2e-actions.py b/bin/gen-e2e-actions.py
index 053ac23e..97fd7a7e 100644
--- a/bin/gen-e2e-actions.py
+++ b/bin/gen-e2e-actions.py
@@ -27,7 +27,7 @@ def generate_file_content(test_name):
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.21'
+          go-version: '1.22.6'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/go.mod b/go.mod
index 27544243..10ca67ba 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/brevdev/brev-cli
 
-go 1.22.0
-
-toolchain go1.22.6
+go 1.22.6
 
 require (
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
diff --git a/tools/go.mod b/tools/go.mod
index ba91fed6..46f5b799 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/brevdev/brev-cli/tools
 
-go 1.21
+go 1.22.6
 
 require (
 	github.com/golangci/golangci-lint v1.57.2