diff --git a/build/templates/dockerfiles/cuda.Dockerfile.txt b/build/templates/dockerfiles/cuda.Dockerfile.txt
index 25aca635..c7adc494 100644
--- a/build/templates/dockerfiles/cuda.Dockerfile.txt
+++ b/build/templates/dockerfiles/cuda.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/build/templates/dockerfiles/geospatial.Dockerfile.txt b/build/templates/dockerfiles/geospatial.Dockerfile.txt
index 4b9cd25a..3361f124 100644
--- a/build/templates/dockerfiles/geospatial.Dockerfile.txt
+++ b/build/templates/dockerfiles/geospatial.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/build/templates/dockerfiles/ml-verse.Dockerfile.txt b/build/templates/dockerfiles/ml-verse.Dockerfile.txt
index c16ebddb..f505c69f 100644
--- a/build/templates/dockerfiles/ml-verse.Dockerfile.txt
+++ b/build/templates/dockerfiles/ml-verse.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/build/templates/dockerfiles/ml.Dockerfile.txt b/build/templates/dockerfiles/ml.Dockerfile.txt
index ad0fd860..1d5a81c2 100644
--- a/build/templates/dockerfiles/ml.Dockerfile.txt
+++ b/build/templates/dockerfiles/ml.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/build/templates/dockerfiles/r-ver.Dockerfile.txt b/build/templates/dockerfiles/r-ver.Dockerfile.txt
index 420c5dc5..00c3b923 100644
--- a/build/templates/dockerfiles/r-ver.Dockerfile.txt
+++ b/build/templates/dockerfiles/r-ver.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/build/templates/dockerfiles/rstudio.Dockerfile.txt b/build/templates/dockerfiles/rstudio.Dockerfile.txt
index b4219e37..88c55235 100644
--- a/build/templates/dockerfiles/rstudio.Dockerfile.txt
+++ b/build/templates/dockerfiles/rstudio.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV RSTUDIO_VERSION="{{rstudio_version}}"
diff --git a/build/templates/dockerfiles/shiny-verse.Dockerfile.txt b/build/templates/dockerfiles/shiny-verse.Dockerfile.txt
index db988b36..a45e47d2 100644
--- a/build/templates/dockerfiles/shiny-verse.Dockerfile.txt
+++ b/build/templates/dockerfiles/shiny-verse.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/build/templates/dockerfiles/shiny.Dockerfile.txt b/build/templates/dockerfiles/shiny.Dockerfile.txt
index 4bda582f..b9736776 100644
--- a/build/templates/dockerfiles/shiny.Dockerfile.txt
+++ b/build/templates/dockerfiles/shiny.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV SHINY_SERVER_VERSION="latest"
diff --git a/build/templates/dockerfiles/tidyverse.Dockerfile.txt b/build/templates/dockerfiles/tidyverse.Dockerfile.txt
index 10e00cc7..d6cba36f 100644
--- a/build/templates/dockerfiles/tidyverse.Dockerfile.txt
+++ b/build/templates/dockerfiles/tidyverse.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/build/templates/dockerfiles/verse.Dockerfile.txt b/build/templates/dockerfiles/verse.Dockerfile.txt
index db116c3d..e3d52da0 100644
--- a/build/templates/dockerfiles/verse.Dockerfile.txt
+++ b/build/templates/dockerfiles/verse.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/cuda_4.4.1.Dockerfile b/dockerfiles/cuda_4.4.1.Dockerfile
index a03eb845..d24ce307 100644
--- a/dockerfiles/cuda_4.4.1.Dockerfile
+++ b/dockerfiles/cuda_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/cuda_4.4.2.Dockerfile b/dockerfiles/cuda_4.4.2.Dockerfile
index a9128350..14f732c4 100644
--- a/dockerfiles/cuda_4.4.2.Dockerfile
+++ b/dockerfiles/cuda_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/cuda_devel.Dockerfile b/dockerfiles/cuda_devel.Dockerfile
index 15358051..18c85de2 100644
--- a/dockerfiles/cuda_devel.Dockerfile
+++ b/dockerfiles/cuda_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/geospatial_4.4.1.Dockerfile b/dockerfiles/geospatial_4.4.1.Dockerfile
index ffefee3c..a1899500 100644
--- a/dockerfiles/geospatial_4.4.1.Dockerfile
+++ b/dockerfiles/geospatial_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/geospatial_4.4.2.Dockerfile b/dockerfiles/geospatial_4.4.2.Dockerfile
index bd1c2b4f..a80ced06 100644
--- a/dockerfiles/geospatial_4.4.2.Dockerfile
+++ b/dockerfiles/geospatial_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/geospatial_devel.Dockerfile b/dockerfiles/geospatial_devel.Dockerfile
index 05f15c90..e1bf7c8c 100644
--- a/dockerfiles/geospatial_devel.Dockerfile
+++ b/dockerfiles/geospatial_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/ml-verse_4.4.1.Dockerfile b/dockerfiles/ml-verse_4.4.1.Dockerfile
index 87573f1d..dcfafce3 100644
--- a/dockerfiles/ml-verse_4.4.1.Dockerfile
+++ b/dockerfiles/ml-verse_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml-verse_4.4.2.Dockerfile b/dockerfiles/ml-verse_4.4.2.Dockerfile
index 78ad24a7..58c3c673 100644
--- a/dockerfiles/ml-verse_4.4.2.Dockerfile
+++ b/dockerfiles/ml-verse_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml-verse_devel.Dockerfile b/dockerfiles/ml-verse_devel.Dockerfile
index 42072db9..aac50221 100644
--- a/dockerfiles/ml-verse_devel.Dockerfile
+++ b/dockerfiles/ml-verse_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml_4.4.1.Dockerfile b/dockerfiles/ml_4.4.1.Dockerfile
index 7da805ef..8399809c 100644
--- a/dockerfiles/ml_4.4.1.Dockerfile
+++ b/dockerfiles/ml_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml_4.4.2.Dockerfile b/dockerfiles/ml_4.4.2.Dockerfile
index 2607344f..da81bbb9 100644
--- a/dockerfiles/ml_4.4.2.Dockerfile
+++ b/dockerfiles/ml_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml_devel.Dockerfile b/dockerfiles/ml_devel.Dockerfile
index 383b4f03..64d378b8 100644
--- a/dockerfiles/ml_devel.Dockerfile
+++ b/dockerfiles/ml_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/r-ver_4.4.1.Dockerfile b/dockerfiles/r-ver_4.4.1.Dockerfile
index ba5b3891..6aae8880 100644
--- a/dockerfiles/r-ver_4.4.1.Dockerfile
+++ b/dockerfiles/r-ver_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/r-ver_4.4.2.Dockerfile b/dockerfiles/r-ver_4.4.2.Dockerfile
index aa31c9a2..c0a51d1e 100644
--- a/dockerfiles/r-ver_4.4.2.Dockerfile
+++ b/dockerfiles/r-ver_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/r-ver_devel.Dockerfile b/dockerfiles/r-ver_devel.Dockerfile
index 35081cf4..794a9941 100644
--- a/dockerfiles/r-ver_devel.Dockerfile
+++ b/dockerfiles/r-ver_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/rstudio_4.4.1.Dockerfile b/dockerfiles/rstudio_4.4.1.Dockerfile
index c3bb6590..7dfb1a39 100644
--- a/dockerfiles/rstudio_4.4.1.Dockerfile
+++ b/dockerfiles/rstudio_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV RSTUDIO_VERSION="2024.09.1+394"
diff --git a/dockerfiles/rstudio_4.4.2.Dockerfile b/dockerfiles/rstudio_4.4.2.Dockerfile
index 72b1d58e..2f65a6e3 100644
--- a/dockerfiles/rstudio_4.4.2.Dockerfile
+++ b/dockerfiles/rstudio_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV RSTUDIO_VERSION="2024.09.1+394"
diff --git a/dockerfiles/rstudio_devel.Dockerfile b/dockerfiles/rstudio_devel.Dockerfile
index 3c221057..404357ba 100644
--- a/dockerfiles/rstudio_devel.Dockerfile
+++ b/dockerfiles/rstudio_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV RSTUDIO_VERSION="2024.09.1+394"
diff --git a/dockerfiles/shiny-verse_4.4.1.Dockerfile b/dockerfiles/shiny-verse_4.4.1.Dockerfile
index c1d6c1b7..3c31c40d 100644
--- a/dockerfiles/shiny-verse_4.4.1.Dockerfile
+++ b/dockerfiles/shiny-verse_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/shiny-verse_4.4.2.Dockerfile b/dockerfiles/shiny-verse_4.4.2.Dockerfile
index 6dcb3e8f..a1e68018 100644
--- a/dockerfiles/shiny-verse_4.4.2.Dockerfile
+++ b/dockerfiles/shiny-verse_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/shiny-verse_devel.Dockerfile b/dockerfiles/shiny-verse_devel.Dockerfile
index 20fb235c..d45e6213 100644
--- a/dockerfiles/shiny-verse_devel.Dockerfile
+++ b/dockerfiles/shiny-verse_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/shiny_4.4.1.Dockerfile b/dockerfiles/shiny_4.4.1.Dockerfile
index 90a5b58e..b7f8bef1 100644
--- a/dockerfiles/shiny_4.4.1.Dockerfile
+++ b/dockerfiles/shiny_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV SHINY_SERVER_VERSION="latest"
diff --git a/dockerfiles/shiny_4.4.2.Dockerfile b/dockerfiles/shiny_4.4.2.Dockerfile
index d73e02d2..47fbbe14 100644
--- a/dockerfiles/shiny_4.4.2.Dockerfile
+++ b/dockerfiles/shiny_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV SHINY_SERVER_VERSION="latest"
diff --git a/dockerfiles/shiny_devel.Dockerfile b/dockerfiles/shiny_devel.Dockerfile
index c19d4d89..61ec07a6 100644
--- a/dockerfiles/shiny_devel.Dockerfile
+++ b/dockerfiles/shiny_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV SHINY_SERVER_VERSION="latest"
diff --git a/dockerfiles/tidyverse_4.4.1.Dockerfile b/dockerfiles/tidyverse_4.4.1.Dockerfile
index 2df806b3..d628362f 100644
--- a/dockerfiles/tidyverse_4.4.1.Dockerfile
+++ b/dockerfiles/tidyverse_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/tidyverse_4.4.2.Dockerfile b/dockerfiles/tidyverse_4.4.2.Dockerfile
index ddc97e3b..6dd62517 100644
--- a/dockerfiles/tidyverse_4.4.2.Dockerfile
+++ b/dockerfiles/tidyverse_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/tidyverse_devel.Dockerfile b/dockerfiles/tidyverse_devel.Dockerfile
index 66236277..bd2ab7ae 100644
--- a/dockerfiles/tidyverse_devel.Dockerfile
+++ b/dockerfiles/tidyverse_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/verse_4.4.1.Dockerfile b/dockerfiles/verse_4.4.1.Dockerfile
index 52b19292..5efea1be 100644
--- a/dockerfiles/verse_4.4.1.Dockerfile
+++ b/dockerfiles/verse_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/verse_4.4.2.Dockerfile b/dockerfiles/verse_4.4.2.Dockerfile
index 7c21a197..9f4fecd6 100644
--- a/dockerfiles/verse_4.4.2.Dockerfile
+++ b/dockerfiles/verse_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/verse_devel.Dockerfile b/dockerfiles/verse_devel.Dockerfile
index 0f7f49a2..f6349447 100644
--- a/dockerfiles/verse_devel.Dockerfile
+++ b/dockerfiles/verse_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove "$(id -un 1000)";
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh