diff --git a/README.md b/README.md
index 5a9f59e..c6bdb40 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,16 @@ repo init -u "https://git.blackfinn.de/yocto/linux-blackfinn.git"
 repo sync
 ```
 
+## Build environment
+
+For details see <https://git.blackfinn.de/docker/oe-buildenv>.
+
+### Execute
+
+```shell
+docker run -it --rm --network host -v=/var/lib/sss/pipes/:/var/lib/sss/pipes/:rw -v $(pwd):$(pwd) -w $(pwd) -u $(id -u $USER):$(id -g $USER) oe-buildenv /bin/bash
+```
+
 ## Set Environment
 
 ```shell
@@ -53,3 +63,16 @@ bmaptool copy --bmap \
 	/dev/<sd_card>
 ```
 
+## opkg package handling
+
+### Build index
+
+```shell
+bitbake package index
+```
+
+### Synchronize packages
+
+```shell
+rsync -avz --progress build/tmp/deploy/ipk/ /srv/files.blackfinn.de/data/yocto/gatesgarth/
+```
diff --git a/default.xml b/default.xml
index 2c5df2a..b281dc5 100644
--- a/default.xml
+++ b/default.xml
@@ -4,14 +4,17 @@
 
     <remote name="yo" fetch="git://git.yoctoproject.org"/>
     <remote name="oe" fetch="git://git.openembedded.org"/>
-    <remote name="bf" fetch="https://git.blackfinn.de/yocto"/>
+	<remote name="gh" fetch="https://github.com"/>
+    <remote name="bf" fetch="https://git.blackfinn.de"/>
 
-    <project name="poky"                remote="yo" revision="gatesgarth" path="layers/poky"                clone-depth="1"/>
-    <project name="meta-openembedded"   remote="oe" revision="gatesgarth" path="layers/meta-openembedded"   clone-depth="1"/>
-    <project name="meta-raspberrypi"    remote="yo" revision="gatesgarth" path="layers/meta-raspberrypi"    clone-depth="1"/>
-    <project name="meta-security"       remote="yo" revision="gatesgarth" path="layers/meta-security"       clone-depth="1"/>
-    <project name="meta-virtualization" remote="yo" revision="gatesgarth" path="layers/meta-virtualization" clone-depth="1"/>
-    <project name="meta-blackfinn"      remote="bf" revision="gatesgarth" path="layers/meta-blackfinn">
+    <project name="poky" remote="yo" revision="hardknott" path="layers/poky" clone-depth="1"/>
+    <project name="meta-openembedded" remote="oe" revision="hardknott" path="layers/meta-openembedded" clone-depth="1"/>
+    <project name="meta-raspberrypi" remote="yo" revision="master"    path="layers/meta-raspberrypi" clone-depth="1"/>
+    <project name="meta-security" remote="yo" revision="hardknott" path="layers/meta-security" clone-depth="1"/>
+    <project name="meta-virtualization" remote="yo" revision="hardknott" path="layers/meta-virtualization" clone-depth="1"/>
+    <project name="meta-rust/meta-rust" remote="gh" revision="master" path="layers/meta-rust"/>
+
+    <project name="yocto/meta-blackfinn" remote="bf" revision="gatesgarth" path="layers/meta-blackfinn">
         <linkfile dest="blackfinn-init-build-env" src="buildconf/blackfinn-init-build-env"/>
     </project>