diff --git a/docker/Dockerfile b/docker/Dockerfile
index b780341..6f32a11 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM kalilinux/kali-linux-docker
+FROM kalilinux/kali
 # Metadata params
 ARG BUILD_DATE
 ARG VERSION
@@ -19,8 +19,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.url='https://www.kali.org/' \
       org.label-schema.vendor='Offensive Security' \
       org.label-schema.schema-version='1.0' \
-      org.label-schema.docker.cmd='docker run --rm kalilinux/kali-linux-docker' \
-      org.label-schema.docker.cmd.devel='docker run --rm -ti kalilinux/kali-linux-docker' \
+      org.label-schema.docker.cmd='docker run --rm kalilinux/kali' \
+      org.label-schema.docker.cmd.devel='docker run --rm -ti kalilinux/kali' \
       org.label-schema.docker.debug='docker logs $CONTAINER' \
       io.github.offensive-security.docker.dockerfile="Dockerfile" \
       io.github.offensive-security.license="GPLv3" \
@@ -34,6 +34,8 @@ RUN set -x \
     && apt-get clean \
     && apt-get install -yqq build-essential python-dev libnetfilter-queue-dev tshark tcpdump python3-pip wireshark \
     && apt install -yqq python3-pip \
+    && apt install -yqq git \
+    && pip3 install -U git+https://github.com/kti/python-netfilterqueue \
     && pip3 install --process-dependency-links polymorph
 
 RUN apt-get install -yqq linux-image; exit 0
diff --git a/docker/Dockerfile-victim b/docker/Dockerfile-victim
index 4c0248d..52daa15 100644
--- a/docker/Dockerfile-victim
+++ b/docker/Dockerfile-victim
@@ -1,4 +1,4 @@
-FROM kalilinux/kali-linux-docker
+FROM kalilinux/kali
 # Metadata params
 ARG BUILD_DATE
 ARG VERSION
@@ -17,8 +17,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.url='https://www.kali.org/' \
       org.label-schema.vendor='Offensive Security' \
       org.label-schema.schema-version='1.0' \
-      org.label-schema.docker.cmd='docker run --rm kalilinux/kali-linux-docker' \
-      org.label-schema.docker.cmd.devel='docker run --rm -ti kalilinux/kali-linux-docker' \
+      org.label-schema.docker.cmd='docker run --rm kalilinux/kali' \
+      org.label-schema.docker.cmd.devel='docker run --rm -ti kalilinux/kali' \
       org.label-schema.docker.debug='docker logs $CONTAINER' \
       io.github.offensive-security.docker.dockerfile="Dockerfile" \
       io.github.offensive-security.license="GPLv3" \
@@ -30,7 +30,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN set -x \
     && apt-get -yqq update \
     && apt-get clean
-RUN apt-get -yqq install gnupg gnupg2 
+RUN apt-get -yqq install gnupg gnupg2 wget
 RUN wget http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key
 RUN apt-key add mosquitto-repo.gpg.key
 RUN echo "deb http://repo.mosquitto.org/debian jessie main" > /etc/apt/sources.list.d/mosquitto.list