diff --git a/builder/build.sh b/builder/build.sh
index b416c85..0437648 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -37,10 +37,10 @@ export HYPRIOT_IMAGE_VERSION
 export KERNEL_BUILD="20160520-141137"
 export KERNEL_VERSION="4.4.10"
 export DOCKER_ENGINE_VERSION="1.11.1-1"
-export DOCKER_COMPOSE_VERSION="1.7.1-38"
+export DOCKER_COMPOSE_VERSION="1.7.1-40"
 export DOCKER_MACHINE_VERSION="0.7.0-26"
-export DEVICE_INIT_VERSION="0.1.5"
-export CLUSTER_LAB_VERSION="0.2.8-1"
+export DEVICE_INIT_VERSION="0.1.7"
+export CLUSTER_LAB_VERSION="0.2.12-1"
 
 # create build directory for assembling our image filesystem
 rm -rf ${BUILD_PATH}
diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 32b8820..640d77b 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -15,7 +15,7 @@ wget -q https://packagecloud.io/gpg.key -O - | apt-key add -
 echo 'deb https://packagecloud.io/Hypriot/rpi/debian/ jessie main' > /etc/apt/sources.list.d/hypriot.list
 
 # set up hypriot schatzkiste repository for generic packages
-echo 'deb https://packagecloud.io/Hypriot/Schatzkiste/debian/ wheezy main' >> /etc/apt/sources.list.d/hypriot.list
+echo 'deb https://packagecloud.io/Hypriot/Schatzkiste/debian/ jessie main' >> /etc/apt/sources.list.d/hypriot.list
 
 wget -q -O - http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add -
 echo 'deb http://archive.raspberrypi.org/debian/ jessie main' | tee /etc/apt/sources.list.d/raspberrypi.list
diff --git a/builder/test-integration/spec/hypriotos-image/cluster_lab_spec.rb b/builder/test-integration/spec/hypriotos-image/cluster_lab_spec.rb
index 6a80a22..3fbc1c5 100644
--- a/builder/test-integration/spec/hypriotos-image/cluster_lab_spec.rb
+++ b/builder/test-integration/spec/hypriotos-image/cluster_lab_spec.rb
@@ -6,7 +6,7 @@
 
 describe command('dpkg -l hypriot-cluster-lab') do
   its(:stdout) { should match /ii  hypriot-cluster-lab/ }
-  its(:stdout) { should match /0.2.8/ }
+  its(:stdout) { should match /0.2.12/ }
   its(:exit_status) { should eq 0 }
 end
 
diff --git a/builder/test-integration/spec/hypriotos-image/device-init_spec.rb b/builder/test-integration/spec/hypriotos-image/device-init_spec.rb
index c5cd0d3..cba1ad9 100644
--- a/builder/test-integration/spec/hypriotos-image/device-init_spec.rb
+++ b/builder/test-integration/spec/hypriotos-image/device-init_spec.rb
@@ -6,7 +6,7 @@
 
 describe command('dpkg -l device-init') do
   its(:stdout) { should match /ii  device-init/ }
-  its(:stdout) { should match /0.1.5/ }
+  its(:stdout) { should match /0.1.7/ }
   its(:exit_status) { should eq 0 }
 end
 
diff --git a/builder/test-integration/spec/hypriotos-image/hypriot-list_spec.rb b/builder/test-integration/spec/hypriotos-image/hypriot-list_spec.rb
index 9ca4e7b..87b7d99 100644
--- a/builder/test-integration/spec/hypriotos-image/hypriot-list_spec.rb
+++ b/builder/test-integration/spec/hypriotos-image/hypriot-list_spec.rb
@@ -4,7 +4,7 @@
   it { should be_file }
   it { should be_mode 644 }
   it { should be_owned_by 'root' }
-  it { should contain 'deb https://packagecloud.io/Hypriot/Schatzkiste/debian/ wheezy main' }
+  it { should contain 'deb https://packagecloud.io/Hypriot/Schatzkiste/debian/ jessie main' }
 end
 
 describe package('apt-transport-https') do