diff --git a/.golangci.yml b/.golangci.yml
index 940e3a195..f2af22566 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -15,7 +15,7 @@ linters:
     - errcheck
 
 run:
-  deadline: 2m
+  timeout: 2m
   skip-dirs:
     - api
     - design
diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go
index 697345910..655295fc8 100644
--- a/cmd/containerd/command/service_windows.go
+++ b/cmd/containerd/command/service_windows.go
@@ -49,8 +49,6 @@ var (
 	allocConsole = kernel32.NewProc("AllocConsole")
 	oldStderr    windows.Handle
 	panicFile    *os.File
-
-	service *handler
 )
 
 const defaultServiceName = "containerd"
@@ -282,7 +280,6 @@ func launchService(s *server.Server, done chan struct{}) error {
 		return err
 	}
 
-	service = h
 	go func() {
 		if interactive {
 			err = debug.Run(serviceNameFlag, h)
diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools
index 7a9cd7f96..00589fd87 100755
--- a/script/setup/install-dev-tools
+++ b/script/setup/install-dev-tools
@@ -26,6 +26,6 @@ go get -u github.com/cpuguy83/go-md2man
 
 (
 	cd "$GOPATH"/src/github.com/golangci/golangci-lint/cmd/golangci-lint
-	git checkout v1.18.0
+	git checkout v1.23.8
 	go build -v && go install
 )