diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3377b7f..53f28fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 -----------
 
+# v2.14.0+rev1
+## (2018-07-18)
+
+* Update the meta-resin submodule to version v2.14.0 [Florin]
+
 # v2.13.6+rev1
 ## (2018-07-13)
 
diff --git a/VERSION b/VERSION
index 6224ccf..5b7ab5b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.13.6+rev1
+2.14.0+rev1
diff --git a/layers/meta-resin b/layers/meta-resin
index e167839..2c4ac61 160000
--- a/layers/meta-resin
+++ b/layers/meta-resin
@@ -1 +1 @@
-Subproject commit e167839b84b4e93313942a47078a896a6e32b6a2
+Subproject commit 2c4ac61bc17188b35d98263378ed961c2a30519a
diff --git a/layers/meta-resin-allwinner/conf/samples/local.conf.sample b/layers/meta-resin-allwinner/conf/samples/local.conf.sample
index 2477e2d..4263fb0 100644
--- a/layers/meta-resin-allwinner/conf/samples/local.conf.sample
+++ b/layers/meta-resin-allwinner/conf/samples/local.conf.sample
@@ -3,8 +3,6 @@
 #MACHINE ?= "nanopi-neo-air"
 
 # More info meta-resin/README.md
-#RESIN_CONNECTABLE ?= "1"
-#RESIN_CONNECTABLE_ENABLE_SERVICES ?= "0"
 #TARGET_REPOSITORY ?= ""
 #TARGET_TAG ?= ""
 BALENA_STORAGE = "overlay2"
diff --git a/layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend b/layers/meta-resin-allwinner/recipes-containers/docker-disk/resin-supervisor.bbappend
similarity index 100%
rename from layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
rename to layers/meta-resin-allwinner/recipes-containers/docker-disk/resin-supervisor.bbappend