diff --git a/osx/Dockerfile b/osx/Dockerfile
index fde566d182..65926a6ba8 100644
--- a/osx/Dockerfile
+++ b/osx/Dockerfile
@@ -40,9 +40,9 @@ RUN chmod +x /docker-compose
 
 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
 # RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v${BOOT2DOCKER_ISO_VERSION}/boot2docker.iso
-RUN curl -fsSL -o /boot2docker-virtualbox.iso https://s3.amazonaws.com/docker-mcn/public/b2d-next/boot2docker-virtualbox.iso
+RUN curl -fsSL -o /boot2docker-virtualbox.iso https://s3.amazonaws.com/toolbox-rc/boot2docker-virtualbox-1.8.0-dev.iso
 
-ENV KITEMATIC_VERSION 0.8.0-rc1
+ENV KITEMATIC_VERSION 0.8.0-rc2
 RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip
 
 ENV INSTALLER_VERSION $DOCKER_VERSION
@@ -160,6 +160,7 @@ RUN cd /mpkg/kitematicapp.pkg && \
 	mkdir ./rootfs && \
 	cd ./rootfs && \
   7z x /kitematic.zip && \
+  rm -rf ./__MACOSX && \
   ls -al . && \
 	find . | cpio -o --format odc | gzip -c > ../Payload && \
 	mkbom . ../Bom && \