diff --git a/.gitmodules b/.gitmodules
index 3e8d0bd..d500f46 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "resin-yocto-scripts"]
-	path = resin-yocto-scripts
-	url = https://github.com/resin-os/resin-yocto-scripts.git
+[submodule "balena-yocto-scripts"]
+	path = balena-yocto-scripts
+	url = https://github.com/balena-os/balena-yocto-scripts.git
 [submodule "layers/poky"]
 	path = layers/poky
 	url = https://git.yoctoproject.org/git/poky
diff --git a/balena-yocto-scripts b/balena-yocto-scripts
new file mode 160000
index 0000000..84c60eb
--- /dev/null
+++ b/balena-yocto-scripts
@@ -0,0 +1 @@
+Subproject commit 84c60eba818d4276d449692a3084f2c20e0eaae8
diff --git a/layers/meta-resin b/layers/meta-resin
index 426f690..aa87658 160000
--- a/layers/meta-resin
+++ b/layers/meta-resin
@@ -1 +1 @@
-Subproject commit 426f69000bf1c6f632345a1b63a1572f99c55e77
+Subproject commit aa876586512dfca97fcf2e5d5ef536e9fbc41fa1
diff --git a/resin-yocto-scripts b/resin-yocto-scripts
deleted file mode 160000
index a118ee9..0000000
--- a/resin-yocto-scripts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a118ee9883101269bb56620074c384b3f582aba4