diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9cc4b813..4c03cb2e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
             git submodule update --remote Pillow
           fi
           (cd Pillow && git checkout main)
-          sudo chown -R 1000 $(pwd)
+          sudo chown -R 1001 $(pwd)
 
       - name: Test Image Build
         if: "matrix.test-image"
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index e54ecf89..01f78d4b 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -40,7 +40,7 @@ RUN cd /depends \
     && ./install_imagequant.sh \
     && ./install_raqm.sh
 
-RUN /usr/sbin/adduser -D pillow \
+RUN /usr/sbin/adduser -D --uid 1001 pillow \
     && virtualenv /vpy3 \
     && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
     && /vpy3/bin/pip install --no-cache-dir olefile pytest pytest-cov pytest-timeout \
diff --git a/amazon-2-amd64/Dockerfile b/amazon-2-amd64/Dockerfile
index 4e353d96..7603e890 100644
--- a/amazon-2-amd64/Dockerfile
+++ b/amazon-2-amd64/Dockerfile
@@ -35,7 +35,7 @@ RUN yum install -y \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd --uid 1000 pillow
+RUN useradd --uid 1001 pillow
 
 RUN wget https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz \
     && tar xzf Python-3.9.16.tgz \
diff --git a/amazon-2023-amd64/Dockerfile b/amazon-2023-amd64/Dockerfile
index 60b0750b..dcfb89e0 100644
--- a/amazon-2023-amd64/Dockerfile
+++ b/amazon-2023-amd64/Dockerfile
@@ -36,7 +36,7 @@ RUN yum install -y \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd --uid 1000 pillow
+RUN useradd --uid 1001 pillow
 
 RUN bash -c "/usr/bin/pip3 install virtualenv \
     && /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 \
diff --git a/arch/Dockerfile b/arch/Dockerfile
index 64f6409b..36f3fb87 100644
--- a/arch/Dockerfile
+++ b/arch/Dockerfile
@@ -41,7 +41,7 @@ RUN cd /depends \
      && ./install_imagequant.sh \
      && ./install_raqm.sh
 
-RUN /sbin/useradd -m -U -u 1000 pillow \
+RUN /sbin/useradd -m -U --uid 1001 pillow \
     && virtualenv --system-site-packages /vpy3 \
     && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
     && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \
diff --git a/centos-stream-9-amd64/Dockerfile b/centos-stream-9-amd64/Dockerfile
index a384f63d..3dca1cea 100644
--- a/centos-stream-9-amd64/Dockerfile
+++ b/centos-stream-9-amd64/Dockerfile
@@ -33,7 +33,7 @@ RUN yum install -y \
     zlib-devel \
     && yum clean all
 
-RUN useradd --uid 1000 pillow
+RUN useradd --uid 1001 pillow
 
 RUN bash -c "python3.9 -m pip install virtualenv \
     && python3.9 -m virtualenv --system-site-packages /vpy3 \
diff --git a/debian-11-bullseye-amd64/Dockerfile b/debian-11-bullseye-amd64/Dockerfile
index e1c572d0..07b1a3a3 100644
--- a/debian-11-bullseye-amd64/Dockerfile
+++ b/debian-11-bullseye-amd64/Dockerfile
@@ -65,7 +65,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
diff --git a/debian-12-bookworm-amd64/Dockerfile b/debian-12-bookworm-amd64/Dockerfile
index 818e07e9..245d0fce 100644
--- a/debian-12-bookworm-amd64/Dockerfile
+++ b/debian-12-bookworm-amd64/Dockerfile
@@ -65,7 +65,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
diff --git a/debian-12-bookworm-x86/Dockerfile b/debian-12-bookworm-x86/Dockerfile
index fcf467c7..9036e6a7 100644
--- a/debian-12-bookworm-x86/Dockerfile
+++ b/debian-12-bookworm-x86/Dockerfile
@@ -65,7 +65,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd pillow \
+RUN useradd -u 1001 pillow \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
diff --git a/fedora-39-amd64/Dockerfile b/fedora-39-amd64/Dockerfile
index 6d45acf4..a387ee8d 100644
--- a/fedora-39-amd64/Dockerfile
+++ b/fedora-39-amd64/Dockerfile
@@ -25,7 +25,7 @@ RUN dnf install -y \
     zlib-devel \
     && dnf clean all
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
diff --git a/fedora-40-amd64/Dockerfile b/fedora-40-amd64/Dockerfile
index 9e72e9b6..246235af 100644
--- a/fedora-40-amd64/Dockerfile
+++ b/fedora-40-amd64/Dockerfile
@@ -25,7 +25,7 @@ RUN dnf install -y \
     zlib-devel \
     && dnf clean all
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
diff --git a/gentoo/Dockerfile b/gentoo/Dockerfile
index 5be45e59..6967946a 100644
--- a/gentoo/Dockerfile
+++ b/gentoo/Dockerfile
@@ -27,7 +27,7 @@ RUN emerge --quiet dev-python/virtualenv dev-util/cargo-c dev-build/meson x11-mi
 RUN USE="jpeg jpeg2k lcms tiff truetype webp xcb zlib" emerge --quiet --onlydeps dev-python/pillow
 RUN emerge --quiet app-text/ghostscript-gpl dev-python/numpy
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && chown pillow:pillow /home/pillow
 
 RUN virtualenv --system-site-packages /vpy3 \
diff --git a/ubuntu-20.04-focal-amd64/Dockerfile b/ubuntu-20.04-focal-amd64/Dockerfile
index 8145482f..e66ab36f 100644
--- a/ubuntu-20.04-focal-amd64/Dockerfile
+++ b/ubuntu-20.04-focal-amd64/Dockerfile
@@ -43,7 +43,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
diff --git a/ubuntu-22.04-jammy-amd64/Dockerfile b/ubuntu-22.04-jammy-amd64/Dockerfile
index 92cce941..c4a87de1 100644
--- a/ubuntu-22.04-jammy-amd64/Dockerfile
+++ b/ubuntu-22.04-jammy-amd64/Dockerfile
@@ -40,7 +40,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
diff --git a/ubuntu-24.04-noble-amd64-valgrind/Dockerfile b/ubuntu-24.04-noble-amd64-valgrind/Dockerfile
index 6a49b412..12851b2c 100644
--- a/ubuntu-24.04-noble-amd64-valgrind/Dockerfile
+++ b/ubuntu-24.04-noble-amd64-valgrind/Dockerfile
@@ -34,7 +34,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN useradd pillow \
-    && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
diff --git a/ubuntu-24.04-noble-amd64/Dockerfile b/ubuntu-24.04-noble-amd64/Dockerfile
index 8f382726..04e5995c 100644
--- a/ubuntu-24.04-noble-amd64/Dockerfile
+++ b/ubuntu-24.04-noble-amd64/Dockerfile
@@ -42,7 +42,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     && rm -rf /var/lib/apt/lists/*
 
 RUN useradd pillow \
-    && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
diff --git a/ubuntu-24.04-noble-arm64v8/Dockerfile b/ubuntu-24.04-noble-arm64v8/Dockerfile
index cf70cd61..74f72eb7 100644
--- a/ubuntu-24.04-noble-arm64v8/Dockerfile
+++ b/ubuntu-24.04-noble-arm64v8/Dockerfile
@@ -32,7 +32,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     && rm -rf /var/lib/apt/lists/*
 
 RUN useradd pillow \
-    && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
diff --git a/ubuntu-24.04-noble-ppc64le/Dockerfile b/ubuntu-24.04-noble-ppc64le/Dockerfile
index 3f37c5fe..2759042d 100644
--- a/ubuntu-24.04-noble-ppc64le/Dockerfile
+++ b/ubuntu-24.04-noble-ppc64le/Dockerfile
@@ -32,7 +32,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     && rm -rf /var/lib/apt/lists/*
 
 RUN useradd pillow \
-    && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
diff --git a/ubuntu-24.04-noble-s390x/Dockerfile b/ubuntu-24.04-noble-s390x/Dockerfile
index 41f26699..e880ae71 100644
--- a/ubuntu-24.04-noble-s390x/Dockerfile
+++ b/ubuntu-24.04-noble-s390x/Dockerfile
@@ -30,7 +30,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     && rm -rf /var/lib/apt/lists/*
 
 RUN useradd pillow \
-    && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow