diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index 985e5760c810c7413881f778e3c31dc74cfc41ef..b4b5dccf50dba48d8dbc075a8f0941336354714b 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -215,7 +215,7 @@ RUN spack debug report                                                  \
 
 COPY eic-shell /usr/local/bin/eic-shell
 COPY eic-info /usr/local/bin/eic-info
-COPY oneentrypoint.sh /usr/local/sbin/entrypoint.sh
+COPY entrypoint.sh /usr/local/sbin/entrypoint.sh
 COPY eic-env.sh /etc/eic-env.sh
 COPY profile.d/a00_cleanup.sh /etc/profile.d
 COPY profile.d/z11_jug_env.sh /etc/profile.d
@@ -324,7 +324,10 @@ RUN chmod +x /usr/local/sbin/entrypoint.sh
 
 ## make sure we have the entrypoints setup correctly
 ENTRYPOINT ["/usr/local/sbin/entrypoint.sh"]
-CMD ["bash", "--rcfile", "/etc/profile", "-l"]
+
+## set up oneAPI environment while using login (-l) shell
+CMD ["bash", "--rcfile", "/etc/profile", "-l", "-c",                    \
+      "source /opt/intel/oneapi/setvars.sh --force 2> /dev/null"]
 USER 0
 WORKDIR /
 SHELL ["/usr/local/bin/eic-shell"]
diff --git a/containers/oneapi/oneentrypoint.sh b/containers/oneapi/oneentrypoint.sh
deleted file mode 100644
index 8a98d97ef2d03569ec7dfcdabfff6b83a25376ab..0000000000000000000000000000000000000000
--- a/containers/oneapi/oneentrypoint.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-## Force environment to be clean
-. /etc/eic-env.sh
-
-## Source OneAPI environment
-. /opt/intel/oneapi/setvars.sh --force 2> /dev/null
-
-exec "$@"