diff --git a/.gitattributes b/.gitattributes
index f92a83dc..61b434ce 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -25,6 +25,7 @@ Makefile text
 *.yml text
 *.patch text
 *.txt text
+CODEOWNERS text
 
 # Binary files (no line-ending conversions)
 *.bz2 binary diff=hex
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000..5200713e
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+* @thundron @zvin @jviotti
+/scripts @nazrhom
diff --git a/Makefile b/Makefile
index 0e0b4909..a432c60e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # ---------------------------------------------------------------------
 
 RESIN_SCRIPTS ?= ./scripts/resin
-NPM_VERSION ?= 6.7.0
+export NPM_VERSION ?= 6.7.0
 S3_BUCKET = artifacts.ci.balena-cloud.com
 
 # This directory will be completely deleted by the `clean` rule