diff --git a/Dockerfile b/Dockerfile
index c1113613..f46c237e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,10 +9,9 @@ RUN cd src; ./build_release.sh
 FROM ubuntu:18.04
 ENV ZOKRATES_HOME=/home/zokrates/.zokrates
 
-COPY --from=build /build/src/scripts/install_libsnark_prerequisites.sh /tmp/
-
-RUN /tmp/install_libsnark_prerequisites.sh \
-&& useradd -u 1000 -m zokrates
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends libgmp3-dev \
+    && useradd -u 1000 -m zokrates
 
 USER zokrates
 WORKDIR /home/zokrates
diff --git a/Dockerfile.env b/Dockerfile.env
index 73de372b..bbd60816 100644
--- a/Dockerfile.env
+++ b/Dockerfile.env
@@ -22,12 +22,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         clang-format \
         python3 \
         python-markdown \
-        && add-apt-repository ppa:jonathonf/firefox-esr; apt-get install -y firefox-esr \
+        && add-apt-repository ppa:mozillateam/ppa \
+        && apt-get update \
+        && apt-get install -y --no-install-recommends firefox-esr \
         && rm -rf /var/lib/apt/lists/*
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain none -y \
     && rustup toolchain install nightly --allow-downgrade --profile minimal --component rustfmt \
     && cargo install --git https://github.com/rustwasm/wasm-pack \
+    && rm -rf /usr/local/cargo/registry \
     && curl -sL https://deb.nodesource.com/setup_lts.x | bash - && apt-get install -y nodejs && npm i -g solc \
     && curl -sL https://raw.githubusercontent.com/Sarcasm/run-clang-format/master/run-clang-format.py > /opt/run-clang-format.py \
     && chmod +x /opt/run-clang-format.py \