diff --git a/Dockerfile b/Dockerfile
index 43fdf5b..1074dc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
-FROM registry.fedoraproject.org/fedora:31
+FROM registry.fedoraproject.org/fedora:30
 
-ENV NAME=fedora-toolbox VERSION=31
-LABEL com.redhat.component="$NAME" \
+ENV NAME=fedora-toolbox VERSION=30
+LABEL com.github.containers.toolbox="true" \
+      com.github.debarshiray.toolbox="true" \
+      com.redhat.component="$NAME" \
       name="$FGC/$NAME" \
       version="$VERSION" \
       usage="This image is meant to be used with the toolbox command" \
@@ -13,8 +15,14 @@ COPY README.md /
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
 RUN dnf -y swap coreutils-single coreutils-full
 
+COPY missing-docs /
+RUN dnf -y reinstall $(<missing-docs)
+RUN rm /missing-docs
+
 COPY extra-packages /
 RUN dnf -y install $(<extra-packages)
 RUN rm /extra-packages
 
+RUN dnf clean all
+
 CMD /bin/sh
diff --git a/README.md b/README.md
index b8b81a5..a602a07 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ This is particularly useful on
 systems is to discourage installation of software on the host, and instead
 install software as (or in) containers.
 
-However this project doesn't *require* using an OSTree based system — it
+However, this tool doesn't *require* using an OSTree based system — it
 works equally well if you're running e.g. existing Fedora Workstation or
 Server, and that's a useful way to incrementally adopt containerization.
 
diff --git a/extra-packages b/extra-packages
index 09ba35d..b37c946 100644
--- a/extra-packages
+++ b/extra-packages
@@ -3,7 +3,7 @@ bzip2
 diffutils
 dnf-plugins-core
 findutils
-flatpak-xdg-utils
+flatpak-spawn
 fpaste
 git
 gnupg
@@ -12,6 +12,7 @@ hostname
 iputils
 jwhois
 keyutils
+krb5-libs
 less
 lsof
 man-db
@@ -19,11 +20,11 @@ man-pages
 mlocate
 mtr
 openssh-clients
-PackageKit-command-not-found
 passwd
 pigz
 procps-ng
 rsync
+shadow-utils
 sudo
 tcpdump
 time
diff --git a/missing-docs b/missing-docs
new file mode 100644
index 0000000..f1f56bc
--- /dev/null
+++ b/missing-docs
@@ -0,0 +1,18 @@
+acl
+bash
+chkconfig
+curl
+dbus-daemon
+gawk
+grep
+gzip
+libcap
+openssl
+p11-kit
+pam
+python3
+rpm
+rpm-plugin-systemd-inhibit
+sed
+systemd
+tar