diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..89c0ed1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+# Ignore build directory
+build*/
+
+# Ignore shared directories
+shared-*/
+
+# Some log files from scripts
+*.log
+
+# device type manifest stuff
+/node_modules
+*.json
+
+# dynamically created by the build script
+conf-notes.txt
diff --git a/layers/meta-resin b/layers/meta-resin
index fe3779d..3848b0e 160000
--- a/layers/meta-resin
+++ b/layers/meta-resin
@@ -1 +1 @@
-Subproject commit fe3779d036b2535c61c10ba195738cdbfdd630c9
+Subproject commit 3848b0e8f7880ec9505d21d6eb2413a1ec1f02d7
diff --git a/layers/meta-resin-allwinner/conf/samples/local.conf.sample b/layers/meta-resin-allwinner/conf/samples/local.conf.sample
index ec6001e..e48f01f 100644
--- a/layers/meta-resin-allwinner/conf/samples/local.conf.sample
+++ b/layers/meta-resin-allwinner/conf/samples/local.conf.sample
@@ -1,5 +1,6 @@
 # Supported machines
 #MACHINE ?= "orange-pi-lite"
+#MACHINE ?= "nanopi-neo-air"
 
 # More info meta-resin/README.md
 #RESIN_CONNECTABLE ?= "1"
diff --git a/nanopi-neo-air.coffee b/nanopi-neo-air.coffee
index 7b5594d..1ec4179 100644
--- a/nanopi-neo-air.coffee
+++ b/nanopi-neo-air.coffee
@@ -20,7 +20,7 @@ module.exports =
 
 	yocto:
 		machine: 'nanopi-neo-air'
-		image: 'resin-image-flasher'
+		image: 'resin-image'
 		fstype: 'resinos-img'
 		version: 'yocto-morty'
 		deployArtifact: 'resin-image-nanopi-neo-air.resinos-img'