anchor.diff:      swig \
       lib32ncurses6 && \
       apt-get clean -y && \
  -    pip install six
  +    rm -rf /var/lib/apt/lists/*
   
   COPY . ${STOQ_TMP}
   
   WORKDIR ${STOQ_TMP}
   
  -# Install stoQ
  -RUN python3 setup.py install
  -
  -# Install stoQ plugins and related binaries
  -RUN git clone --depth 1 -b v3 https://github.com/PUNCH-Cyber/stoq-plugins-public ${STOQ_TMP}/stoq-plugins-public && \
  +# Install stoQ and plugins
  +RUN pip install --no-cache-dir six && \
  +    python3 setup.py install && \
  +    git clone --depth 1 -b v3 https://github.com/PUNCH-Cyber/stoq-plugins-public ${STOQ_TMP}/stoq-plugins-public && \
       cd ${STOQ_TMP}/stoq-plugins-public && \
       for plugin in $(ls -d */); do stoq install $plugin; done
   
  +# Ensure the latest version of the IANA TLDs are in the appropriate place for the iocextract plugin
  +ADD https://data.iana.org/TLD/tlds-alpha-by-domain.txt $STOQ_HOME/plugins/iocextract/
  +
  +RUN chmod 644 $STOQ_HOME/plugins/iocextract/tlds-alpha-by-domain.txt
  +
   # Install xorsearch
  -RUN wget -O XORSearch.zip "https://didierstevens.com/files/software/XORSearch_V${XORSEARCH_VER}.zip" && \
  +RUN wget -O XORSearch.zip "https://github.com/DidierStevens/FalsePositives/blob/master/XORSearch_V${XORSEARCH_VER}.zip?raw=true" && \
       unzip -qq XORSearch -d XORSearch && \
       gcc -o /usr/local/bin/xorsearch XORSearch/XORSearch.c
   
  
positive.code:     wget -O triddefs.zip "http://mark0.net/download/triddefs.zip" && \
      unzip -qq triddefs -d $STOQ_HOME/plugins/trid
  
  # Ensure the latest version of the IANA TLDs are in the appropriate place for the iocextract plugin
  ADD https://data.iana.org/TLD/tlds-alpha-by-domain.txt $STOQ_HOME/plugins/iocextract/
  
  RUN chmod 644 $STOQ_HOME/plugins/iocextract/tlds-alpha-by-domain.txt
  
  # Clean up
  RUN rm -rf /var/lib/apt/lists/* $STOQ_TMP /tmp/* /var/tmp/*
  
  USER $USER
  ENTRYPOINT ["stoq"]
  
negative.code: ENV GROUP stoq
  ENV STOQ_HOME /home/$USER/.stoq
  ENV STOQ_TMP /tmp/stoq
  ENV XORSEARCH_VER 1_11_3
  ENV EXIFTOOL_VER 12.00
  
  RUN groupadd -r $GROUP && \
      useradd -r -g $GROUP $USER && \
  