diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b28e27ff..ccb547e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,29 +16,29 @@ jobs:
       with:
         go-version: '1.23.10'
 
-    - uses: actions/cache@v4
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-tools-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-tools
-    
-    - name: Setup tools
-      run: make get_tools
+      - uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-tools-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-tools
 
-    - name: Run Makefile checks
-      run: make checks
+      - name: Setup tools
+        run: make get_tools
+
+      - name: Run Makefile checks
+        run: make checks
 
   tests:
     name: Run Go ${{ matrix.go }} tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.23.6', '1.22.11', '1.21.13']
+        go: ["1.24", "1.23", "1.22"]
 
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
diff --git a/Makefile b/Makefile
index bed3cf5f..9524534f 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ checks: check_tools
 		false;\
     fi
 	
-	@STATICCHECKOUT=$$(staticcheck -go 1.23 -checks all ./...); \
+	@STATICCHECKOUT=$$(staticcheck -go 1.24 -checks all ./...); \
 	if [ -z "$$STATICCHECKOUT" ]; then\
         echo "staticcheck: OK";\
 	else \
@@ -76,7 +76,7 @@ EXECUTABLES = goimports staticcheck govulncheck gosec
 .PHONY: get_tools
 get_tools:
 	go install golang.org/x/tools/cmd/goimports@latest
-	go install honnef.co/go/tools/cmd/staticcheck@2024.1.1
+	go install honnef.co/go/tools/cmd/staticcheck@2025.1.1
 	go install golang.org/x/vuln/cmd/govulncheck@latest
 	go install github.com/securego/gosec/v2/cmd/gosec@latest