diff --git a/fedora-toolbox b/fedora-toolbox
index 5ddaee8..7a0c2e2 100755
--- a/fedora-toolbox
+++ b/fedora-toolbox
@@ -88,6 +88,9 @@ create()
         fi
     fi
 
+    max_uid_count=65536
+    max_minus_uid=$((max_uid_count-UID))
+    uid_plus_one=$((UID+1))
     if ! podman create \
                  --hostname toolbox \
                  --interactive \
@@ -96,6 +99,9 @@ create()
                  --privileged \
                  --security-opt label=disable \
                  --tty \
+                 --uidmap $UID:0:1 \
+                 --uidmap 0:1:$UID \
+                 --uidmap $uid_plus_one:$uid_plus_one:$max_minus_uid \
                  --volume $HOME:$HOME \
                  --volume $XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR \
                  $toolbox_image \