diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile
index 6307dd6793a9c5e7eb7b88fd8661d8aa8d1e18b7..100520e41bbced1c1b14f44480569b4855437179 100644
--- a/containers/builder/Dockerfile
+++ b/containers/builder/Dockerfile
@@ -51,4 +51,5 @@ RUN find -L /opt/view/* -type f -exec readlink -f '{}' \; | \
 RUN cd /opt/spack-environment && \
     spack env activate --sh -d . >> /etc/profile.d/z10_spack_environment.sh
 
-ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l"]
+ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"]
+CMD ["bash"]
diff --git a/containers/release/Dockerfile b/containers/release/Dockerfile
index 759dcf12d1cae4cc79acb3dfd588903989be2ea0..9c71766f5f90073da5bc600b45c64a90eaff04f8 100644
--- a/containers/release/Dockerfile
+++ b/containers/release/Dockerfile
@@ -26,4 +26,5 @@ COPY --from=builder /opt/view /opt/view
 COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh
 COPY --from=builder /root/.bashrc /etc/bash.bashrc
 
-ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l"]
+ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"]
+CMD ["bash"]