diff --git a/builder/build.sh b/builder/build.sh
index eaf17f2..aee6799 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -84,7 +84,7 @@ ls -alh /image_with_kernel_*.tar.gz
 
 # download the ready-made raw image for the RPi
 if [ ! -f "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" ]; then
-  wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://github.com/hypriot/image-builder-raw/releases/download/${RAW_IMAGE_VERSION}/${RAW_IMAGE}.zip"
+  wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://jenkins.laboratoriopublico.org/job/image-builder-raw/ws/${RAW_IMAGE}.zip"
 fi
 
 # verify checksum of the ready-made raw image
diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index f9ac33b..1ac0258 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -119,8 +119,11 @@ echo 'deb http://archive.raspberrypi.org/debian/ stretch main' | tee /etc/apt/so
 apt-get update
 # apt-get upgrade -y
 
+# Check free space
+df -h /
+
 # install packages
-apt-get  -o Dpkg::Options::=--force-confdef \
+DEBIAN_FRONTEND=noninteractive apt-get  -o Dpkg::Options::=--force-confdef \
   install -y \
   --no-install-recommends \
   firmware-atheros \
@@ -147,8 +150,10 @@ apt-get  -o Dpkg::Options::=--force-confdef \
   pi-bluetooth \
   lsb-release \
   gettext \
-  cloud-init
-
+  cloud-init \
+  pt-ui-mods \
+  xserver-xorg \
+  git
 
 # install special Docker enabled kernel
 if [ -z "${KERNEL_URL}" ]; then
@@ -220,3 +225,6 @@ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 echo "HYPRIOT_DEVICE=\"$HYPRIOT_DEVICE\"" >> /etc/os-release
 echo "HYPRIOT_IMAGE_VERSION=\"$HYPRIOT_IMAGE_VERSION\"" >> /etc/os-release
 cp /etc/os-release /boot/os-release
+
+# Integrate camera development work (see https://publiclab.org/notes/MaggPi/08-09-2018/raspberry-pi-manual-camera-control )
+git clone https://github.com/MargaretAN9/Peggy/ /home/publiclab/Peggy
diff --git a/builder/files/boot/user-data b/builder/files/boot/user-data
index 0befcb1..f2ed8ff 100644
--- a/builder/files/boot/user-data
+++ b/builder/files/boot/user-data
@@ -68,5 +68,8 @@ runcmd:
   # Pickup the hostname changes
   - 'systemctl restart avahi-daemon'
 
+  # Give ownership of scripts
+  - 'chown publiclab.publiclab /home/publiclab/Peggy -R'
+
 #  # Activate WiFi interface
 #  - 'ifup wlan0'
diff --git a/versions.config b/versions.config
index f7bb136..d1e5bfc 100644
--- a/versions.config
+++ b/versions.config
@@ -4,8 +4,8 @@ ROOTFS_TAR_CHECKSUM="d1e7e6d48a25b4a206c5df99ecb8815388ec6945e4f97e78413d5a80778
 
 # name of the ready made raw image for RPi
 RAW_IMAGE="rpi-raw.img"
-RAW_IMAGE_VERSION="v0.2.2"
-RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1c2c6"
+RAW_IMAGE_VERSION="master"
+RAW_IMAGE_CHECKSUM="e32c0b9f3cdb9c60bad97a724103fc1283cdc135848e6142d588cd96fac1d6a8"
 
 # specific versions of kernel/firmware and docker tools
 export KERNEL_BUILD="20180422-141901"