diff --git a/.github/workflows/go-check.yml b/.github/workflows/go-check.yml
index a9ebd33..6cdb278 100644
--- a/.github/workflows/go-check.yml
+++ b/.github/workflows/go-check.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.1
+          go-version: 1.23.5
 
       - name: Verify Go Mod and Go Sum
         run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ba7f27f..bdd3611 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -45,7 +45,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.1"
+          go-version: "1.23.5"
 
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
diff --git a/go.mod b/go.mod
index cd9267d..e2fd214 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/celestiaorg/blobstream-contracts/v4
 
-go 1.22
-
-toolchain go1.22.5
+go 1.23.5
 
 require github.com/ethereum/go-ethereum v1.14.13
 
diff --git a/scripts/Dockerfile_Environment b/scripts/Dockerfile_Environment
index 1c1edef..1eaa8a2 100644
--- a/scripts/Dockerfile_Environment
+++ b/scripts/Dockerfile_Environment
@@ -28,7 +28,7 @@ RUN curl -L https://foundry.paradigm.xyz | bash && . /root/.bashrc && foundryup
 RUN wget https://github.com/ethereum/solidity/releases/download/v0.8.22/solc-static-linux -O /usr/bin/solc && chmod +x /usr/bin/solc
 
 # install go
-RUN wget https://go.dev/dl/go1.21.1.linux-amd64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.21.1.linux-amd64.tar.gz && echo 'PATH=$PATH:/usr/local/go/bin:/root/go/bin' >> ~/.bashrc
+RUN wget https://go.dev/dl/go1.23.5.linux-amd64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.23.5.linux-amd64.tar.gz && echo 'PATH=$PATH:/usr/local/go/bin:/root/go/bin' >> ~/.bashrc
 
 # install abigen
 RUN git clone --depth 1 --branch v1.12.0 https://github.com/ethereum/go-ethereum.git && cd go-ethereum && PATH=$PATH:/usr/local/go/bin make devtools