diff --git a/layers/meta-balena b/layers/meta-balena
index 9ace976ea..1a93c02dc 160000
--- a/layers/meta-balena
+++ b/layers/meta-balena
@@ -1 +1 @@
-Subproject commit 9ace976ea9d757d3d928ed59ce60c4118bb9d557
+Subproject commit 1a93c02dc832b1c2131991264ca13d8dcafa28a3
diff --git a/layers/meta-balena-jetson/conf/layer.conf b/layers/meta-balena-jetson/conf/layer.conf
index 3a951d415..90a08e1d0 100644
--- a/layers/meta-balena-jetson/conf/layer.conf
+++ b/layers/meta-balena-jetson/conf/layer.conf
@@ -15,12 +15,23 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "tegra-nvpmodel tegra-configs-nvstartup t
 
 BBMASK += "/meta-tegra/recipes-core/ "
 BBMASK += "/meta-tegra/external/ "
-BBMASK += "/meta-tegra/recipes-graphics/ "
+
+BBMASK += "/meta-tegra/recipes-graphics/cairo "
+BBMASK += "/meta-tegra/recipes-graphics/clutter "
+BBMASK += "/meta-tegra/recipes-graphics/cogl "
+BBMASK += "/meta-tegra/recipes-graphics/drm "
+BBMASK += "/meta-tegra/recipes-graphics/mesa "
+BBMASK += "/meta-tegra/recipes-graphics/vulkan "
+BBMASK += "/meta-tegra/recipes-graphics/wayland "
+BBMASK += "/meta-tegra/recipes-graphics/xorg-xserver "
+
 BBMASK += "/meta-tegra/external/openembedded-layer/recipes-support/opencv/ "
-BBMASK += "/meta-tegra/recipes-multimedia/gstreamer/"
+BBMASK += "/meta-tegra/recipes-multimedia/gstreamer/ "
 
 LAYERSERIES_COMPAT_balena-jetson = "warrior"
 LAYERSERIES_COMPAT_tegra = "warrior"
 SERIAL_CONSOLES_jetson-xavier = "115200;ttyTHS0"
 SERIAL_CONSOLES_jetson-tx2 = "115200;ttyS0"
 SERIAL_CONSOLES_jetson-tx1 = "115200;ttyS0"
+
+NVIDIA_DEVNET_MIRROR = "file://home/acostach/work/tx2alteplaci/balena-jetson/sdkm_downloads"
diff --git a/layers/meta-balena-jetson/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_%.bbappend b/layers/meta-balena-jetson/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_%.bbappend
new file mode 100644
index 000000000..7e8a0b2cd
--- /dev/null
+++ b/layers/meta-balena-jetson/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_%.bbappend
@@ -0,0 +1,2 @@
+# We don't need to build or install docker-ce and cuda-toolkit
+RDEPENDS_${PN} = ""
diff --git a/layers/meta-balena-jetson/recipes-core/images/resin-image.inc b/layers/meta-balena-jetson/recipes-core/images/resin-image.inc
index 06f1a534a..8fbe6a93e 100644
--- a/layers/meta-balena-jetson/recipes-core/images/resin-image.inc
+++ b/layers/meta-balena-jetson/recipes-core/images/resin-image.inc
@@ -73,8 +73,10 @@ RESIN_BOOT_PARTITION_FILES_jetson-tx1 = " \
 
 do_rootfs_resinos-img_jetson-xavier-nx-devkit-emmc[depends] += " tegra194-nxde-flash-dry:do_deploy "
 
-# The space resinOS takes will amount to 1GiB
-IMAGE_ROOTFS_SIZE = "487424"
+# Although current space seems enough just for libcuda, it's still not enough for
+# testing first with all the files in tegra-libraries, to ensure the docker patches work fine.
+# So let's double the size just for now, while testing.
+IMAGE_ROOTFS_SIZE = "974848"
 
 # Need space for all the above signed update binaries
 RESIN_BOOT_SIZE_jetson-nano = "80960"
@@ -111,6 +113,7 @@ IMAGE_INSTALL_append_jetson-xavier-nx-devkit-emmc = " \
     tegra-configs-udev \
 "
 
+# Added cuda-driver, tegra-libraries with libcuda.so and container tools
 IMAGE_INSTALL_append_jetson-tx2 = " \
     tegra186-flash-dry \
     parted \
@@ -124,6 +127,11 @@ IMAGE_INSTALL_append_jetson-tx2 = " \
     linux-firmware-bcm4354 \
     tegra-firmware-xusb \
     bt-scripts \
+    cuda-driver \
+    tegra-libraries \
+    libnvidia-container-tools \
+    go-runtime \
+    nvidia-container-toolkit \
 "
 
 IMAGE_INSTALL_append_srd3-tx2 = " \
diff --git a/layers/meta-balena-jetson/recipes-devtools/cuda/cuda-binaries_10.0.326-1.bbappend b/layers/meta-balena-jetson/recipes-devtools/cuda/cuda-binaries_10.0.326-1.bbappend
new file mode 100644
index 000000000..0c9b07353
--- /dev/null
+++ b/layers/meta-balena-jetson/recipes-devtools/cuda/cuda-binaries_10.0.326-1.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/files"
+
+# This recipe doesn't find the repo in our DEVNET mirror
+# for some reason, just copy the file here in "files" directory
+SRC_URI = "file://cuda-repo-l4t-10-0-local-10.0.326_1.0-1_arm64.deb "
diff --git a/layers/meta-balena-jetson/recipes-devtools/cuda/files/README b/layers/meta-balena-jetson/recipes-devtools/cuda/files/README
new file mode 100644
index 000000000..49cb166fd
--- /dev/null
+++ b/layers/meta-balena-jetson/recipes-devtools/cuda/files/README
@@ -0,0 +1,2 @@
+Copy cuda-repo-l4t-10-0-local-10.0.326_1.0-1_arm64.deb from the DEVNET mirror
+specified in meta-balena-jetson/layer.conf in this directory
diff --git a/layers/meta-tegra b/layers/meta-tegra
index 3b8092d6b..beb762916 160000
--- a/layers/meta-tegra
+++ b/layers/meta-tegra
@@ -1 +1 @@
-Subproject commit 3b8092d6b0ed6bc80e72a117fb5cac18b0684992
+Subproject commit beb762916c9155d36809415476fd9ae8eecab4f1