diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 02f828499c25..1c11aadc92b3 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22.3'
+          go-version: '1.22.4'
       - name: Run Gosec Security Scanner
         run: | # https://github.com/securego/gosec/issues/469
           export PATH=$PATH:$(go env GOPATH)/bin
@@ -48,13 +48,13 @@ jobs:
       - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22.3'
+          go-version: '1.22.4'
           id: go
 
       - name: Golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.55.2
+          version: v1.56.1
           args: --config=.golangci.yml --out-${NO_FUTURE}format colored-line-number
 
   build:
@@ -64,7 +64,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.22.3'
+          go-version: '1.22.4'
         id: go
 
       - name: Check out code into the Go module directory
diff --git a/.golangci.yml b/.golangci.yml
index 2a5b771b78d4..e55ef61f8293 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -6,7 +6,7 @@ run:
     - proto
     - tools/analyzers
   timeout: 10m
-  go: '1.22.3'
+  go: '1.22.4'
 
 linters:
   enable-all: true
@@ -73,6 +73,7 @@ linters:
     - promlinter
     - protogetter
     - revive
+    - spancheck
     - staticcheck
     - stylecheck
     - tagalign
diff --git a/beacon-chain/core/peerdas/helpers.go b/beacon-chain/core/peerdas/helpers.go
index 07dc7256cf5a..efdc2d83f62a 100644
--- a/beacon-chain/core/peerdas/helpers.go
+++ b/beacon-chain/core/peerdas/helpers.go
@@ -206,7 +206,7 @@ func populateAndFilterIndices(indices map[uint64]bool, blobCount uint64) []uint6
 	// If no indices are provided, provide all blobs.
 	if len(indices) == 0 {
 		for i := range blobCount {
-			indices[uint64(i)] = true
+			indices[i] = true
 		}
 	}
 
@@ -317,7 +317,7 @@ func Blobs(indices map[uint64]bool, dataColumnsSidecar []*ethpb.DataColumnSideca
 		}
 
 		blobSidecar := &ethpb.BlobSidecar{
-			Index:                    uint64(blobIndex),
+			Index:                    blobIndex,
 			Blob:                     blob[:],
 			KzgCommitment:            blobKZGCommitment[:],
 			KzgProof:                 blobKzgProof[:],