diff --git a/dockerfiles/peepdf.dockerfile b/dockerfiles/peepdf.dockerfile
index 42656cf..74d534b 100644
--- a/dockerfiles/peepdf.dockerfile
+++ b/dockerfiles/peepdf.dockerfile
@@ -5,11 +5,12 @@ USER root
 RUN apt-get update && apt-get install -y \
   git \
   python3-lxml \
-  python-libemu \
   libemu2 \
-  libemu-dev \
-  libboost-all-dev \
+  pkg-config \
+  autoconf \
+  python-pil \
   python-pip ; \
+  pip install pylibemu ; \
   rm -rf /var/lib/apt/lists/*
 
 RUN groupadd -r nonroot && \
@@ -18,10 +19,11 @@ RUN groupadd -r nonroot && \
   chown -R nonroot:nonroot /home/nonroot
 
 RUN git clone https://github.com/jesparza/peepdf /opt/peepdf
+RUN git clone https://github.com/DidierStevens/DidierStevensSuite /opt/DidierStevensSuite
 
 USER root
 WORKDIR /home/nonroot/
-#RUN pip install -v pyv8
+
 RUN ln -s /opt/peepdf/peepdf.py /bin/peepdf.py
 RUN chmod +x /bin/peepdf.py
 
diff --git a/dockerfiles/plaso.dockerfile b/dockerfiles/plaso.dockerfile
new file mode 100644
index 0000000..58ffcd6
--- /dev/null
+++ b/dockerfiles/plaso.dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:16.04
+
+MAINTAINER tabledevil
+
+
+RUN groupadd -g 999 user && \
+    useradd -r -u 999 -g user user
+
+RUN echo "deb http://ppa.launchpad.net/gift/dev/ubuntu xenial main" > /etc/apt/sources.list.d/gift.list
+RUN echo "deb-src http://ppa.launchpad.net/gift/dev/ubuntu xenial main" >> /etc/apt/sources.list.d/gift.list
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 10C598B8
+
+RUN apt update && apt install -y \
+    python-plaso \
+    plaso-tools \
+    python-elasticsearch \
+    && rm -rf /var/lib/apt/lists/*
+
+USER user