diff --git a/.tool-versions b/.tool-versions
index e3f251c90..826a1062b 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,9 +1,10 @@
 # Languages
 nodejs 18.6.0
 yarn 1.22.19
-golang 1.21.5
+golang 1.22.7
 python 3.9.13
 
+
 # Tools
 mockery 2.22.1
 golangci-lint 1.55.0
diff --git a/relayer/go.mod b/relayer/go.mod
index 7541d6556..bce6992b6 100644
--- a/relayer/go.mod
+++ b/relayer/go.mod
@@ -1,8 +1,6 @@
 module github.com/smartcontractkit/chainlink-starknet/relayer
 
-go 1.22.0
-
-toolchain go1.22.5
+go 1.22.7
 
 require (
 	github.com/NethermindEth/juno v0.3.1
diff --git a/shell.nix b/shell.nix
index e0ae138b2..79b645fac 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,7 +5,7 @@
   scriptDir,
 }:
 with pkgs; let
-  go = pkgs.go_1_21;
+  go = pkgs.go_1_22;
 
   mkShell' = mkShell.override {
     # juno requires building with clang, not gcc
@@ -57,7 +57,11 @@ in
       mkdir -p $GOBIN
       export PATH=$GOBIN:$PATH
       # install gotestloghelper
+<<<<<<< Updated upstream
       # TODO restore latest after versioning is fixed
       go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@bb160ff1069a807693b2c76691c55cb17959fbb5
+=======
+      go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest
+>>>>>>> Stashed changes
     '';
   }