diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c13af43
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+.vscode
+build/cache
+build/downloads
+build/tmp
+build/sstate*
+build/bitbake*
+build/conf/*.txt
+build/conf/templateconf.cfg
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 5744b0d..67447c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,5 +15,8 @@
 	url = https://git.iohub.dev/dany/meta-rpi-diya
 [submodule "meta-wayland"]
 	path = meta-wayland
-	url = https://github.com/MarkusVolk/meta-wayland.git
+	url = https://git.iohub.dev/dany/meta-wayland.git
 	shallow = true
+[submodule "meta-diya"]
+	path = meta-diya
+	url = https://git.iohub.dev/dany/meta-diya.git
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 1431cd8..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,83 +0,0 @@
-pipeline{
-  agent { node{ label'master' }}
-  options {
-    // Limit build history with buildDiscarder option:
-    // daysToKeepStr: history is only kept up to this many days.
-    // numToKeepStr: only this many build logs are kept.
-    // artifactDaysToKeepStr: artifacts are only kept up to this many days.
-    // artifactNumToKeepStr: only this many builds have their artifacts kept.
-    buildDiscarder(logRotator(numToKeepStr: "1"))
-    // Enable timestamps in build log console
-    timestamps()
-    // Maximum time to run the whole pipeline before canceling it
-    timeout(time: 10, unit: 'HOURS')
-    // Use Jenkins ANSI Color Plugin for log console
-    ansiColor('xterm')
-    // Limit build concurrency to 1 per branch
-    disableConcurrentBuilds()
-  }
-  stages
-  {
-    stage('Build image') {
-      agent {
-          docker {
-              image 'xsangle/ci-yocto:focal'
-              // args '-v /var/jenkins_home/workspace/ant-http:/var/jenkins_home/workspace/ant-http'
-              reuseNode true
-          }
-      }
-      steps {
-        sh '''#!/bin/bash
-        printenv
-        # git submodule init
-        git submodule update --init --depth 1
-        cd poky
-        source ./oe-init-build-env ../build
-        cat conf/*.conf
-        # bitbake -c cleanall gcc core-image-base
-        bitbake core-image-base
-        '''
-      }
-    }
-    stage('Build SDK') {
-      agent {
-          docker {
-              image 'xsangle/ci-yocto:focal'
-              reuseNode true
-          }
-      }
-      steps {
-        sh '''#!/bin/bash
-        cd poky
-        source ./oe-init-build-env ../build
-        # bitbake core-image-base -c populate_sdk
-        '''
-      }
-    }
-    stage("Publish") {
-      agent { node{ label'workstation' }}
-      steps{
-        sh'''#!/bin/bash
-        export MACHINE="raspberrypi0-2w-64"
-        # copy rootfs
-        export PUBLIC="/home/dany/public/diya-release"
-        cp -L $(ls build/tmp/deploy/images/$MACHINE/core-image-base-$MACHINE-*rootfs.tar.bz2) $PUBLIC/rootfs-$MACHINE.tar.bz2
-        # copy kernels
-        cp -L build/tmp/deploy/images/$MACHINE/Image-$MACHINE.bin $PUBLIC/
-        cp -L build/tmp/deploy/images/$MACHINE/recovery-$MACHINE.cpio.gz $PUBLIC/
-        # copy image
-        cp $(ls build/tmp/deploy/images/$MACHINE/core-image-base-$MACHINE-*rootfs.wic.bz2) $PUBLIC/diya.img.bz2
-        # copy sdk
-        cp -L build/tmp/deploy/sdk/poky-glibc-x86_64-core-image-base-cortexa53-raspberrypi0-2w-64-toolchain-4.2.1.sh $PUBLIC/
-        '''
-      }
-    }
-    stage('Archive') {
-      steps {
-        script {
-            archiveArtifacts artifacts: 'build/tmp/deploy/images/,build/tmp/deploy/sdk/', fingerprint: true
-        }
-      }
-    }
-  }
-}
diff --git a/README.md b/README.md
index 80a72e5..c72b303 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# meta-rpi-diya-build
+# meta-rpi-diya-distrib
 
diff --git a/meta-diya b/meta-diya
new file mode 160000
index 0000000..b333742
--- /dev/null
+++ b/meta-diya
@@ -0,0 +1 @@
+Subproject commit b333742f9f51d88fde0d81f5d9ce825296032717
diff --git a/meta-openembedded b/meta-openembedded
index d71a08b..edd1a1e 160000
--- a/meta-openembedded
+++ b/meta-openembedded
@@ -1 +1 @@
-Subproject commit d71a08b3d8fc69d3213c10885af9cc693056a8bd
+Subproject commit edd1a1e284fdcb80cd48d411f235d47f23bc27ae
diff --git a/meta-raspberrypi b/meta-raspberrypi
index aa0aed9..c153c69 160000
--- a/meta-raspberrypi
+++ b/meta-raspberrypi
@@ -1 +1 @@
-Subproject commit aa0aed9a08d6578a18c4eeb3b44ed8354a57ebee
+Subproject commit c153c694bd7a08de474470d7c1c7fd550117b162
diff --git a/meta-wayland b/meta-wayland
index 0e9c1ad..6ff79b3 160000
--- a/meta-wayland
+++ b/meta-wayland
@@ -1 +1 @@
-Subproject commit 0e9c1ad46aafad37e09439e884819bfa591ab6ca
+Subproject commit 6ff79b3423d0d4ca9a2afffcc4d197ac2ead5e34
diff --git a/poky b/poky
index c9d5df0..9036bc0 160000
--- a/poky
+++ b/poky
@@ -1 +1 @@
-Subproject commit c9d5df0cddb1e335e780fce995a0ee0660d5ac6e
+Subproject commit 9036bc090c771c710796e3690da59d3ebb96dcf1