diff --git a/Dockerfile b/Dockerfile
index 08e35bf6..c3f35ee7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,9 @@ FROM ubuntu:14.04
 
 MAINTAINER JacobEberhardt <jacob.eberhardt@tu-berlin.de>, Dennis Kuhnert <dennis.kuhnert@campus.tu-berlin.de>
 
-ARG rust_toolchain=nightly-2018-06-04
+ARG RUST_TOOLCHAIN=nightly-2018-06-04
 ARG LIBSNARK_PATH=/root/libsnark
+ARG LIBSNARK_COMMIT=f7c87b88744ecfd008126d415494d9b34c4c1b20
 
 WORKDIR /root/
 
@@ -22,14 +23,18 @@ RUN apt-get update && apt-get install -y \
 ENV LD_LIBRARY_PATH $LD_LIBRARY_PATH:/usr/local/lib
 
 RUN curl https://sh.rustup.rs -sSf | \
-    sh -s -- --default-toolchain $rust_toolchain -y
+    sh -s -- --default-toolchain $RUST_TOOLCHAIN -y
 
 ENV PATH=/root/.cargo/bin:$PATH
 
 RUN git clone https://github.com/scipr-lab/libsnark.git $LIBSNARK_PATH
-RUN cd $LIBSNARK_PATH && git submodule update --init --recursive
+WORKDIR $LIBSNARK_PATH
+RUN git checkout $LIBSNARK_COMMIT
+RUN git submodule update --init --recursive
 
-COPY . /root/ZoKrates
+WORKDIR /root/
 
-#RUN cd ZoKrates \
-#    && cargo build
+COPY . ZoKrates
+
+RUN cd ZoKrates \
+    && cargo build