diff --git a/.gitmodules b/.gitmodules
index 0b27580e4..19b44a940 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -45,3 +45,6 @@
 	branch = honister
 [submodule "layers/meta-compulab-bsp"]
 	branch = honister
+[submodule "layers/meta-balena-hab"]
+	path = layers/meta-balena-hab
+	url = git@github.com:balena-os/meta-balena-hab.git
diff --git a/layers/meta-balena b/layers/meta-balena
index e6d699bff..5659be30b 160000
--- a/layers/meta-balena
+++ b/layers/meta-balena
@@ -1 +1 @@
-Subproject commit e6d699bfffea71667b9551a93f6ee40f56a8ad79
+Subproject commit 5659be30baab3f8b1c8e8c683008a7652c8f8000
diff --git a/layers/meta-balena-hab b/layers/meta-balena-hab
new file mode 160000
index 000000000..bc2c6cd73
--- /dev/null
+++ b/layers/meta-balena-hab
@@ -0,0 +1 @@
+Subproject commit bc2c6cd73557b1492ec78b27053a360af4e8ccd1
diff --git a/layers/meta-balena-imx8mm/conf/samples/bblayers.conf.sample b/layers/meta-balena-imx8mm/conf/samples/bblayers.conf.sample
index add7df089..5967c3d0b 100644
--- a/layers/meta-balena-imx8mm/conf/samples/bblayers.conf.sample
+++ b/layers/meta-balena-imx8mm/conf/samples/bblayers.conf.sample
@@ -10,6 +10,7 @@ BBLAYERS ?= " \
     ${TOPDIR}/../layers/meta-balena/meta-balena-common \
     ${TOPDIR}/../layers/meta-balena/meta-balena-kirkstone \
     ${TOPDIR}/../layers/meta-balena-imx8mm \
+    ${TOPDIR}/../layers/meta-balena-hab \
     ${TOPDIR}/../layers/poky/meta \
     ${TOPDIR}/../layers/poky/meta-poky \
     ${TOPDIR}/../layers/meta-openembedded/meta-oe \