diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..c79fe777899
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,18 @@
+.awcache
+.dockerignore
+.git
+.gitignore
+.github
+data*
+dist
+docker
+docs
+dump.rdb
+node_modules
+/local
+/tmp
+/vendor
+*.yml
+*.md
+/vendor
+/tmp
diff --git a/.gitignore b/.gitignore
index cf13dac6d9b..953c98d04aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,9 @@ docker-compose.yaml
 /conf/provisioning/**/custom.yaml
 profile.cov
 /grafana
+/local
 .notouch
+/Makefile.local
 /pkg/cmd/grafana-cli/grafana-cli
 /pkg/cmd/grafana-server/grafana-server
 /pkg/cmd/grafana-server/debug
diff --git a/Makefile b/Makefile
index 6f7beb837d8..c1d755d247d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+-include local/Makefile
+
 all: deps build
 
 deps-go: