diff --git a/proxy/Makefile b/proxy/Makefile
index 322a135c5..9c699b898 100644
--- a/proxy/Makefile
+++ b/proxy/Makefile
@@ -69,6 +69,10 @@ fmt:
 vet:
 	go vet $(PACKAGES)
 
+.PHONY: staticcheck
+staticcheck:
+	go run honnef.co/go/tools/cmd/staticcheck -tags '$(TAGS)' $(PACKAGES)
+
 .PHONY: lint
 lint:
 	for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;
diff --git a/settings/Makefile b/settings/Makefile
index d83a1ac0d..820504c75 100644
--- a/settings/Makefile
+++ b/settings/Makefile
@@ -72,9 +72,9 @@ fmt:
 vet:
 	go vet $(PACKAGES)
 
-# .PHONY: staticcheck
-# staticcheck:
-# 	go run honnef.co/go/tools/cmd/staticcheck -tags '$(TAGS)' $(PACKAGES)
+.PHONY: staticcheck
+staticcheck:
+	go run honnef.co/go/tools/cmd/staticcheck -tags '$(TAGS)' $(PACKAGES)
 
 .PHONY: lint
 lint:
diff --git a/settings/pkg/proto/v0/staticcheck.conf b/settings/pkg/proto/v0/staticcheck.conf
new file mode 100644
index 000000000..5120a177a
--- /dev/null
+++ b/settings/pkg/proto/v0/staticcheck.conf
@@ -0,0 +1 @@
+checks = ["all", "-ST1003", "-ST1000", "-SA1019"]
\ No newline at end of file
diff --git a/settings/pkg/store/filesystem/staticcheck.conf b/settings/pkg/store/filesystem/staticcheck.conf
new file mode 100644
index 000000000..5120a177a
--- /dev/null
+++ b/settings/pkg/store/filesystem/staticcheck.conf
@@ -0,0 +1 @@
+checks = ["all", "-ST1003", "-ST1000", "-SA1019"]
\ No newline at end of file
diff --git a/store/pkg/proto/v0/staticcheck.conf b/store/pkg/proto/v0/staticcheck.conf
new file mode 100644
index 000000000..5120a177a
--- /dev/null
+++ b/store/pkg/proto/v0/staticcheck.conf
@@ -0,0 +1 @@
+checks = ["all", "-ST1003", "-ST1000", "-SA1019"]
\ No newline at end of file
diff --git a/thumbnails/pkg/proto/v0/staticcheck.conf b/thumbnails/pkg/proto/v0/staticcheck.conf
new file mode 100644
index 000000000..5120a177a
--- /dev/null
+++ b/thumbnails/pkg/proto/v0/staticcheck.conf
@@ -0,0 +1 @@
+checks = ["all", "-ST1003", "-ST1000", "-SA1019"]
\ No newline at end of file