diff --git a/pkgcheck.Dockerfile b/pkgcheck.Dockerfile
index 1a66aae..0aebede 100644
--- a/pkgcheck.Dockerfile
+++ b/pkgcheck.Dockerfile
@@ -12,23 +12,21 @@ RUN cp /workdir/etc/portage/make.conf /etc/portage/make.conf
 ENV USE "-curl -webdav"
 RUN eselect profile set default/linux/amd64/17.1/no-multilib
 RUN mkdir -p /etc/portage/package.accept_keywords
-RUN echo -e 'dev-util/pkgcheck\n  sys-apps/pkgcore\n  dev-python/snakeoil' >> \
+RUN echo -e 'dev-util/pkgcheck\n  sys-apps/pkgcore\n  dev-python/snakeoil\n' \
+    '  dev-python/tree-sitter\n  dev-libs/tree-sitter-bash' >> \
     /etc/portage/package.accept_keywords/portage
-RUN echo '*/* PYTHON_TARGETS: -python2_7' >> /etc/portage/package.use/python
 RUN quickpkg --include-config=y @world sys-libs/glibc
-RUN emerge --root=/workdir --buildpkg=y --usepkg --quiet \
-    dev-util/pkgcheck sys-devel/gcc dev-python/requests dev-vcs/git
+RUN emerge --root=/workdir --buildpkg=y --usepkg=y --noreplace --quiet \
+    dev-util/pkgcheck dev-python/requests dev-vcs/git
 RUN emerge --root=/workdir --rage-clean --quiet \
     app-arch/tar \
     app-arch/xz-utils \
-    dev-libs/openssl \
-    net-dns/libidn2 \
     net-misc/rsync \
     sys-apps/file \
     sys-apps/sed \
     dev-lang/perl \
     sys-libs/timezone-data \
-    app-misc/ca-certificates
+    sys-devel/gcc
 RUN rm -r /workdir/usr/share/gtk-doc
 RUN rm -r /workdir/usr/include
 RUN rm -r /workdir/var/db/pkg