diff --git a/Dockerfile b/Dockerfile
index 00a3caa..e6bab3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
 FROM registry.fedoraproject.org/fedora:31
 
 ENV NAME=fedora-toolbox VERSION=31
-LABEL com.github.debarshiray.toolbox="true" \
+LABEL com.github.containers.toolbox="true" \
+      com.github.debarshiray.toolbox="true" \
       com.redhat.component="$NAME" \
       name="$FGC/$NAME" \
       version="$VERSION" \
@@ -12,7 +13,6 @@ LABEL com.github.debarshiray.toolbox="true" \
 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)
diff --git a/extra-packages b/extra-packages
index d48965e..942271c 100644
--- a/extra-packages
+++ b/extra-packages
@@ -3,11 +3,12 @@ bzip2
 diffutils
 dnf-plugins-core
 findutils
-flatpak-xdg-utils
+flatpak-spawn
 fpaste
 git
 gnupg
 gnupg2-smime
+gvfs-client
 hostname
 iputils
 jwhois
@@ -19,11 +20,13 @@ man-db
 man-pages
 mlocate
 mtr
+nss-mdns
 openssh-clients
 passwd
 pigz
 procps-ng
 rsync
+shadow-utils
 sudo
 tcpdump
 time
@@ -34,5 +37,6 @@ vte-profile
 wget
 which
 words
+xorg-x11-xauth
 xz
 zip