diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index 52f2f14979816bd7ee205b4f90022a7eac70b2bf..81705b5278f8667402e281eb8de2dadb14a0503c 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 entrypoint.sh /usr/local/sbin/entrypoint.sh
+COPY oneentrypoint.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
diff --git a/containers/oneapi/oneentrypoint.sh b/containers/oneapi/oneentrypoint.sh
new file mode 100644
index 0000000000000000000000000000000000000000..8a98d97ef2d03569ec7dfcdabfff6b83a25376ab
--- /dev/null
+++ b/containers/oneapi/oneentrypoint.sh
@@ -0,0 +1,9 @@
+#!/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 "$@"