diff --git a/docker/ubuntu-dev/Dockerfile b/docker/ubuntu-dev/Dockerfile
index 8b016e6fd..05e8dfe8f 100644
--- a/docker/ubuntu-dev/Dockerfile
+++ b/docker/ubuntu-dev/Dockerfile
@@ -8,8 +8,8 @@ RUN apt-get update && \
 	# add-apt-repository
 	software-properties-common \
 	curl \
-	gcc \
-	wget \ 
+	g++ \
+	wget \
 	git \
 	# evmjit dependencies
 	zlib1g-dev \
@@ -18,9 +18,8 @@ RUN apt-get update && \
 # cmake, llvm and rocksdb ppas. then update ppas
 RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \
 	add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \
-	add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \
 	apt-get update && \
-	apt-get install -y --force-yes cmake llvm-3.7-dev librocksdb
+	apt-get install -y --force-yes cmake llvm-3.7-dev
 
 # install evmjit
 RUN git clone https://github.com/debris/evmjit && \
@@ -31,9 +30,6 @@ RUN git clone https://github.com/debris/evmjit && \
 # install multirust
 RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
 
-# install nightly and make it default
-RUN multirust update nightly && multirust default nightly
-
 # export rust LIBRARY_PATH
 ENV LIBRARY_PATH /usr/local/lib
 
diff --git a/docker/ubuntu-jit/Dockerfile b/docker/ubuntu-jit/Dockerfile
index 90ce531be..138882d2b 100644
--- a/docker/ubuntu-jit/Dockerfile
+++ b/docker/ubuntu-jit/Dockerfile
@@ -8,9 +8,9 @@ RUN apt-get update && \
 	# add-apt-repository
 	software-properties-common \
 	curl \
-	wget \ 
+	wget \
 	git \
-	gcc \
+	g++ \
 	# evmjit dependencies
 	zlib1g-dev \
 	libedit-dev
@@ -18,9 +18,8 @@ RUN apt-get update && \
 # cmake, llvm and rocksdb ppas. then update ppas
 RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \
 	add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \
-	add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \
 	apt-get update && \
-	apt-get install -y --force-yes cmake llvm-3.7-dev librocksdb
+	apt-get install -y --force-yes cmake llvm-3.7-dev
 
 # install evmjit
 RUN git clone https://github.com/debris/evmjit && \
@@ -31,9 +30,6 @@ RUN git clone https://github.com/debris/evmjit && \
 # install multirust
 RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
 
-# install nightly and make it default
-RUN multirust update nightly && multirust default nightly
-
 # export rust LIBRARY_PATH
 ENV LIBRARY_PATH /usr/local/lib
 
@@ -41,7 +37,6 @@ ENV LIBRARY_PATH /usr/local/lib
 ENV RUST_BACKTRACE 1
 
 # build parity
-# TODO: add jit feature
 RUN git clone https://github.com/ethcore/parity && \
 	cd parity && \
-	cargo install --features rpc
+	cargo build --release --features ethcore/jit
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 812e66e9e..38c628d0e 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -3,23 +3,14 @@ FROM ubuntu:14.04
 # install tools and dependencies
 RUN apt-get update && \
 	apt-get install -y \
-	gcc \
+	g++ \
 	curl \
 	git \
-	# add-apt-repository
-	software-properties-common
-
-# rocksdb ppas. then update ppas
-RUN add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \
-	apt-get update && \
-	apt-get install -y --force-yes librocksdb
+	make
 
 # install multirust
 RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
 
-# install nightly and make it default
-RUN multirust update nightly && multirust default nightly
-
 # export rust LIBRARY_PATH
 ENV LIBRARY_PATH /usr/local/lib
 
@@ -29,4 +20,4 @@ ENV RUST_BACKTRACE 1
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
 	cd parity && \
-	cargo install --features rpc
+	cargo build --release