diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile
index 87702c47f2fce45c3a4334d4accdbc283b8e9eb3..95d0ea10f671f65a1fbf8aab542fab42c94eb215 100644
--- a/containers/builder/Dockerfile
+++ b/containers/builder/Dockerfile
@@ -52,5 +52,8 @@ RUN cd /opt/spack-environment && \
     spack env activate --sh -d . >> /etc/profile.d/z10_spack_environment.sh && \
     echo "export BINARY_TAG=x86_64-linux-gcc9-opt" >> /etc/profile.d/z10_spack_environment.sh
 
-ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"]
-CMD ["bash"]
+## make sure we have the entrypoints setup correctly
+ENTRYPOINT []
+CMD ["bash", "--rcfile", "/etc/profile", "-l"]
+USER 0
+WORKDIR /
diff --git a/containers/release/Dockerfile b/containers/release/Dockerfile
index 9c71766f5f90073da5bc600b45c64a90eaff04f8..ab677c9c14908c2490df2698b0228a94e0fa7319 100644
--- a/containers/release/Dockerfile
+++ b/containers/release/Dockerfile
@@ -24,7 +24,11 @@ COPY --from=builder /opt/spack-environment /opt/spack-environment
 COPY --from=builder /opt/software /opt/software
 COPY --from=builder /opt/view /opt/view
 COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh
+## Setup global bashrc, useful for singularity
 COPY --from=builder /root/.bashrc /etc/bash.bashrc
 
-ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"]
-CMD ["bash"]
+## make sure we have the entrypoints setup correctly
+ENTRYPOINT []
+CMD ["bash", "--rcfile", "/etc/profile", "-l"]
+USER 0
+WORKDIR /