diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 1465c7861e1..10feacf5ef4 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -15,10 +15,10 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     name: Build
     steps:
-      - name: Set up Go 1.20.5
+      - name: Set up Go 1.20.7
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.5
+          go-version: 1.20.7
         id: go
 
       - name: Check out code into the Go module directory
diff --git a/.github/workflows/check-cli-md.yml b/.github/workflows/check-cli-md.yml
index 84b09a59efc..b72067e9704 100644
--- a/.github/workflows/check-cli-md.yml
+++ b/.github/workflows/check-cli-md.yml
@@ -15,10 +15,10 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     name: Check CLI.md
     steps:
-      - name: Set up Go 1.20.5
+      - name: Set up Go 1.20.7
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.5
+          go-version: 1.20.7
         id: go
 
       - name: Check out code into the Go module directory
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
index b073be0add4..f4042a169a4 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -17,10 +17,10 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     name: Build
     steps:
-      - name: Set up Go 1.20.5
+      - name: Set up Go 1.20.7
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.5
+          go-version: 1.20.7
         id: go
 
       - name: Check out code into the Go module directory
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 804ce84df47..083f58809ee 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -19,10 +19,10 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     name: Build
     steps:
-      - name: Set up Go 1.20.5
+      - name: Set up Go 1.20.7
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.5
+          go-version: 1.20.7
         id: go
 
       - name: Check out code into the Go module directory
@@ -59,10 +59,10 @@ jobs:
       - name: Build
         run: |
           mkdir -p ${BUILD_DIR}
-          cd ${GITHUB_WORKSPACE}/cmd/node && go build -o "${BUILD_DIR}/node" -a -i -ldflags="-X main.appVersion=${APP_VER}"
-          cd ${GITHUB_WORKSPACE}/cmd/keygenerator && go build -o "${BUILD_DIR}/keygenerator" -a -i -ldflags="-X main.appVersion=${APP_VER}"
-          cd ${GITHUB_WORKSPACE}/cmd/logviewer && go build -o "${BUILD_DIR}/logviewer" -a -i -ldflags="-X main.appVersion=${APP_VER}"
-          cd ${GITHUB_WORKSPACE}/cmd/termui && go build -o "${BUILD_DIR}/termui" -a -i -ldflags="-X main.appVersion=${APP_VER}"
+          cd ${GITHUB_WORKSPACE}/cmd/node && go build -o "${BUILD_DIR}/node" -a -ldflags="-X main.appVersion=${APP_VER}"
+          cd ${GITHUB_WORKSPACE}/cmd/keygenerator && go build -o "${BUILD_DIR}/keygenerator" -a -ldflags="-X main.appVersion=${APP_VER}"
+          cd ${GITHUB_WORKSPACE}/cmd/logviewer && go build -o "${BUILD_DIR}/logviewer" -a -ldflags="-X main.appVersion=${APP_VER}"
+          cd ${GITHUB_WORKSPACE}/cmd/termui && go build -o "${BUILD_DIR}/termui" -a -ldflags="-X main.appVersion=${APP_VER}"
 
       - name: Package
         run: |
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 3398482e281..611fadc3d08 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.5
+          go-version: 1.20.7
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
diff --git a/cmd/node/config/enableEpochs.toml b/cmd/node/config/enableEpochs.toml
index 0029d96f399..bde407ef9d6 100644
--- a/cmd/node/config/enableEpochs.toml
+++ b/cmd/node/config/enableEpochs.toml
@@ -249,7 +249,7 @@
     SetGuardianEnableEpoch = 1
 
     # DeterministicSortOnValidatorsInfoEnableEpoch represents the epoch when the deterministic sorting on validators info is enabled
-    DeterministicSortOnValidatorsInfoEnableEpoch = 2
+    DeterministicSortOnValidatorsInfoEnableEpoch = 1
 
     # SCProcessorV2EnableEpoch represents the epoch when SC processor V2 will be used
     SCProcessorV2EnableEpoch = 6
diff --git a/cmd/node/main.go b/cmd/node/main.go
index 9da31568a1d..65fe1165a43 100644
--- a/cmd/node/main.go
+++ b/cmd/node/main.go
@@ -46,10 +46,10 @@ VERSION:
 // appVersion should be populated at build time using ldflags
 // Usage examples:
 // linux/mac:
-//            go build -i -v -ldflags="-X main.appVersion=$(git describe --tags --long --dirty)"
+//            go build -v -ldflags="-X main.appVersion=$(git describe --tags --long --dirty)"
 // windows:
 //            for /f %i in ('git describe --tags --long --dirty') do set VERS=%i
-//            go build -i -v -ldflags="-X main.appVersion=%VERS%"
+//            go build -v -ldflags="-X main.appVersion=%VERS%"
 var appVersion = common.UnVersionedAppString
 
 func main() {
diff --git a/docker/keygenerator/Dockerfile b/docker/keygenerator/Dockerfile
index ce2255b35d8..c66a732e629 100644
--- a/docker/keygenerator/Dockerfile
+++ b/docker/keygenerator/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.6 as builder
+FROM golang:1.20.7 as builder
 
 RUN apt-get update && apt-get install -y
 WORKDIR /go/mx-chain-go
diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile
index e2134167a05..8b0e6c44f14 100644
--- a/docker/node/Dockerfile
+++ b/docker/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.6 as builder
+FROM golang:1.20.7 as builder
 
 RUN apt-get update && apt-get install -y
 WORKDIR /go/mx-chain-go
@@ -6,7 +6,7 @@ COPY . .
 RUN go mod tidy
 # Multiversx node
 WORKDIR /go/mx-chain-go/cmd/node
-RUN go build -i -v -ldflags="-X main.appVersion=$(git describe --tags --long --dirty)"
+RUN go build -v -ldflags="-X main.appVersion=$(git describe --tags --long --dirty)"
 RUN cp /go/pkg/mod/github.com/multiversx/$(cat /go/mx-chain-go/go.mod | grep mx-chain-vm-v | sort -n | tail -n -1| awk -F '/' '{print$3}'| sed 's/ /@/g')/wasmer/libwasmer_linux_amd64.so /lib/libwasmer_linux_amd64.so
 RUN cp /go/pkg/mod/github.com/multiversx/$(cat /go/mx-chain-go/go.mod | grep mx-chain-vm-go | sort -n | tail -n -1| awk -F '/' '{print$3}'| sed 's/ /@/g')/wasmer2/libvmexeccapi.so /lib/libvmexeccapi.so
 
diff --git a/docker/seednode/Dockerfile b/docker/seednode/Dockerfile
index 79216506c32..74cc250c047 100644
--- a/docker/seednode/Dockerfile
+++ b/docker/seednode/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.6 as builder
+FROM golang:1.20.7 as builder
 
 RUN apt-get update && apt-get install -y
 WORKDIR /go/mx-chain-go
diff --git a/docker/termui/Dockerfile b/docker/termui/Dockerfile
index e691bc1b71e..bcc670e3ce3 100644
--- a/docker/termui/Dockerfile
+++ b/docker/termui/Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:1.17.6 as builder
+FROM golang:1.20.7 as builder
 RUN apt-get update && apt-get install -y
 WORKDIR /go/mx-chain-go
 COPY . .
 WORKDIR /go/mx-chain-go/cmd/termui
-RUN go build -i -v
+RUN go build -v
 RUN cp /go/pkg/mod/github.com/multiversx/$(cat /go/mx-chain-go/go.mod | grep mx-chain-vm-v | sort -n | tail -n -1| awk -F '/' '{print$3}'| sed 's/ /@/g')/wasmer/libwasmer_linux_amd64.so /lib/libwasmer_linux_amd64.so
 
 # ===== SECOND STAGE ======