diff --git a/Dockerfile b/Dockerfile
index 40dc922..d576e2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,13 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get -y install python3 curl build-essential
+RUN apt-get update && apt-get -y install python3 curl build-essential apt-transport-https sudo
 RUN curl http://repos.riftio.com/public/xenial-riftware-public-key | apt-key add - && \
-	curl -o /etc/apt/sources.list.d/OSM.list http://buildtracker.riftio.com/repo_file/ub16/OSM/ && \
+	curl -o /etc/apt/sources.list.d/rift.list http://buildtracker.riftio.com/repo_file/ub16/OSM/ && \
 	apt-get update && \
-	apt-get -y install rw.toolchain-rwbase \
-		rw.toolchain-rwtoolchain \
-		rw.core.mgmt-mgmt \
-		rw.core.util-util \
-		rw.core.rwvx-rwvx \
-		rw.core.rwvx-rwdts \
-		rw.automation.core-RWAUTO \
-		rw.tools-container-tools \
-		rw.tools-scripts \
-		python-cinderclient \
-		libxml2-dev \
-		libxslt-dev
+	apt-get -y install \
+		rw.tools-container-tools=5.2.0.0.71033 \
+		rw.tools-scripts=5.2.0.0.71033
 
-RUN /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo OSM
+RUN /usr/rift/container_tools/mkcontainer --modes UI-dev --repo OSM --rw-version 5.2.0.0.71033
 
-RUN chmod 777 /usr/rift /usr/rift/usr/share
-
-RUN rm -rf /tmp/npm-cache
+RUN chmod 777 /usr/rift