diff --git a/conf/machine/am335x-vcu.conf b/conf/machine/am335x-vcu.conf
new file mode 100644
index 0000000..9516cb6
--- /dev/null
+++ b/conf/machine/am335x-vcu.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: Vehicle Control Unit (VCU)
+#@DESCRIPTION: Machine configuration for the VCU mainboard
+
+require conf/machine/include/ti33x.inc
+
+IMAGE_FSTYPES += "tar.gz cpio cpio.gz.u-boot"
+IMAGE_CLASSES += "image_types"
+
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
+
+KERNEL_DEFCONFIG = "am335x-vcu_defconfig"
+KERNEL_DEVICETREE = "am335x-vcu-prod1.dtb \
+    "
+KERNEL_IMAGETYPE = "zImage"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
+PV_pn-linux-netmodule = "4.14.14-${SRCPV}"
+SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/vcu"
+SRCREV_pn-linux-netmodule ?= "${AUTOREV}"
+
diff --git a/recipes-bsp/u-boot/u-boot-am335x-vcu-v1_git.bb b/recipes-bsp/u-boot/u-boot-am335x-vcu-v1_git.bb
new file mode 100644
index 0000000..ac0856b
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-am335x-vcu-v1_git.bb
@@ -0,0 +1,27 @@
+require u-boot-nm.inc
+
+# Force machine configuration for this recipe
+UBOOT_MACHINE = "am335x_vcu_defconfig"
+
+# Be aware github/netmodule git
+SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.04-am335x-hancock"
+
+# Should be updated when a new U-Boot Version is available
+SRCREV ?= "${AUTOREV}"
+PV = "v2016.04+git${SRCPV}"
+# PV = "v2016.04-${SRCREV}"
+
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+
+do_deploy_append() {
+    rm -f ${DEPLOYDIR}/${PN}-spl.bin
+    rm -f ${DEPLOYDIR}/${PN}.bin
+    rm -f ${DEPLOYDIR}/${PN}.img
+    rm -f ${DEPLOYDIR}/MLO-${PN}
+    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/${PN}-spl.bin
+    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.bin
+    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.img
+    cp ${S}/MLO ${DEPLOYDIR}/MLO-${PN}
+}
+
diff --git a/recipes-kernel/linux/linux-netmodule_git.bb b/recipes-kernel/linux/linux-netmodule_git.bb
index aaf4d04..938da7e 100755
--- a/recipes-kernel/linux/linux-netmodule_git.bb
+++ b/recipes-kernel/linux/linux-netmodule_git.bb
@@ -7,10 +7,9 @@ DESCRIPTION = "Linux kernel for various NetModule hardware"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-SRC_URI = "git://github.com/netmodule/linux.git;protocol=https"
-
-SRCREV ?= "6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c"
-PV ?= "4.12.0-${SRCPV}"
+SRC_URI = "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/vcu"
+SRCREV ?= "${AUTOREV}"
+PV ?= "4.14.14-${SRCPV}"
 
 PR = "r0"