diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8fc5686..075e456 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,8 @@
 name: CI
 
+env:
+  GOLANGCI_LINT_VERSION: v1.64.8
+
 on:
   push:
     branches: [main]
@@ -49,4 +52,4 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: latest
+          version: ${{ env.GOLANGCI_LINT_VERSION }}
diff --git a/Makefile b/Makefile
index 088be01..49d6d70 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 # Binary name
 BINARY=nightshift
 PKG=./cmd/nightshift
+GOLANGCI_LINT_VERSION?=v1.64.8
 
 # Build the binary
 build:
@@ -43,7 +44,7 @@ coverage-html: coverage
 
 # Run golangci-lint (if installed)
 lint:
-	@which golangci-lint > /dev/null || (echo "golangci-lint not installed. Run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest" && exit 1)
+	@which golangci-lint > /dev/null || (echo "golangci-lint not installed. Run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)" && exit 1)
 	golangci-lint run
 
 # Clean build artifacts