diff --git a/Dockerfile b/Dockerfile
index 3a4358335..3c7188d82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:16.04 as builder
+FROM ubuntu:18.04 as builder
 LABEL author="Abdelrahman Hosny <abdelrahman.hosny@hotmail.com>"
-
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y build-essential \
     clang \
     bison \
@@ -10,29 +10,17 @@ RUN apt-get update && apt-get install -y build-essential \
     tcl-dev \
     libffi-dev \
     git \
-    graphviz \
-    xdot \
     pkg-config \
-    python3
-
+    python3 && \
+    rm -rf /var/lib/apt/lists
 COPY . /
 RUN make && \
     make install
 
+FROM ubuntu:18.04
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y libreadline-dev tcl-dev
 
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y clang \
-    bison \
-    flex \
-    libreadline-dev \
-    gawk \
-    tcl-dev \
-    libffi-dev \
-    git \
-    graphviz \
-    xdot \
-    pkg-config \
-    python3
 COPY --from=builder /yosys /build/yosys
 COPY --from=builder /yosys-abc /build/yosys-abc
 COPY --from=builder /yosys-config /build/yosys-config
@@ -40,8 +28,6 @@ COPY --from=builder /yosys-filterlib /build/yosys-filterlib
 COPY --from=builder /yosys-smtbmc /build/yosys-smtbmc
 
 ENV PATH /build:$PATH
-
-RUN mkdir /data
-WORKDIR /data
-
+RUN useradd -m yosys
+USER yosys
 ENTRYPOINT ["yosys"]