diff --git a/.golangci.yml b/.golangci.yml
index 6ec4773fbb..bca44903db 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -10,17 +10,19 @@ linters:
   - govet
   - ineffassign
   - lll
-  - megacheck
+  - gosimple
+  - staticcheck
   - misspell
   - nakedret
   - revive
   - unconvert
   - unused
   enable-all: false
-run:
-  skip-files:
+issues:
+  exclude-files:
   - schema.go
   - pulumiManifest.go
+run:
   timeout: 20m
 linters-settings:
   gci:
diff --git a/Makefile b/Makefile
index da3a3e2a6c..8b7f6462b2 100644
--- a/Makefile
+++ b/Makefile
@@ -130,12 +130,12 @@ install_plugins: .pulumi/bin/pulumi
 	.pulumi/bin/pulumi plugin install converter terraform 1.0.17
 
 lint_provider: provider
-	cd provider && golangci-lint run -c ../.golangci.yml
+	cd provider && golangci-lint run --path-prefix provider -c ../.golangci.yml
 
 # `lint_provider.fix` is a utility target meant to be run manually
 # that will run the linter and fix errors when possible.
 lint_provider.fix:
-	cd provider && golangci-lint run -c ../.golangci.yml --fix
+	cd provider && golangci-lint run --path-prefix provider -c ../.golangci.yml --fix
 
 # `make provider_no_deps` builds the provider binary directly, without ensuring that
 # `cmd/pulumi-resource-aws/schema.json` is valid and up to date.