diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 58901750..6fb2ebef 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,6 +21,8 @@ repos:
         name: Hadolint linter
         description: Runs Hadolint to check for Dockerfile best practices
         language: system
+        # Exclude ppc64le Dockerfile since cannot check their build easily
+        exclude: ppc64
         types:
           - dockerfile
         entry: hadolint
diff --git a/examples/docker-compose/notebook/Dockerfile b/examples/docker-compose/notebook/Dockerfile
index f364738c..b16d0edb 100644
--- a/examples/docker-compose/notebook/Dockerfile
+++ b/examples/docker-compose/notebook/Dockerfile
@@ -4,12 +4,13 @@
 # Pick your favorite docker-stacks image
 FROM jupyter/minimal-notebook:55d5ca6be183
 
-USER jovyan
-
-# Add permanent pip/conda installs, data files, other user libs here
-# e.g., RUN pip install jupyter_dashboards
-
 USER root
 
 # Add permanent apt-get installs and other root commands here
 # e.g., RUN apt-get install npm nodejs
+
+USER $NB_UID
+
+# Switch back to jovyan to avoid accidental container runs as root
+# Add permanent pip/conda installs, data files, other user libs here
+# e.g., RUN pip install jupyter_dashboards
diff --git a/examples/make-deploy/Dockerfile b/examples/make-deploy/Dockerfile
index 1cc71656..c0efbfbd 100644
--- a/examples/make-deploy/Dockerfile
+++ b/examples/make-deploy/Dockerfile
@@ -4,12 +4,13 @@
 # Pick your favorite docker-stacks image
 FROM jupyter/minimal-notebook:2d125a7161b5
 
-USER jovyan
-
-# Add permanent pip/conda installs, data files, other user libs here
-# e.g., RUN pip install jupyter_dashboards
-
 USER root
 
 # Add permanent apt-get installs and other root commands here
 # e.g., RUN apt-get install npm nodejs
+
+USER $NB_UID
+
+# Switch back to jovyan to avoid accidental container runs as root
+# Add permanent pip/conda installs, data files, other user libs here
+# e.g., RUN pip install jupyter_dashboards