diff --git a/.golangci.yml b/.golangci.yml
index aa44668b8d6a..cd4080278890 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -40,7 +40,8 @@ linters:
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    - typecheck
+    # Temporarily disabled due to flakiness
+    # - typecheck
     - unparam
     - unused
 linters-settings:
@@ -65,3 +66,6 @@ issues:
   exclude-rules:
     - path: server/artifacts/artifact_server_test.go
       text: "response body must be closed"
+    - path: /
+      linters:
+        - typecheck
diff --git a/Makefile b/Makefile
index 10bff1f5d868..da410c0171a6 100644
--- a/Makefile
+++ b/Makefile
@@ -413,7 +413,7 @@ lint: server/static/files.go $(GOPATH)/bin/golangci-lint
 	# Tidy Go modules
 	go mod tidy
 	# Lint Go files
-	$(GOPATH)/bin/golangci-lint run --fix --verbose
+	$(GOPATH)/bin/golangci-lint run --fix --verbose -c .golangci.yml
 	# Lint the UI
 	if [ -e ui/node_modules ]; then yarn --cwd ui lint ; fi