diff --git a/container-images/cuda/Containerfile b/container-images/cuda/Containerfile
index 6e98884a7..9479dac0d 100644
--- a/container-images/cuda/Containerfile
+++ b/container-images/cuda/Containerfile
@@ -13,3 +13,5 @@ COPY --chmod=755 ../scripts /usr/bin
 
 RUN dnf install -y python3 && \
     /usr/bin/build_rag.sh rag
+
+ENTRYPOINT []
diff --git a/container-images/intel-gpu/Containerfile b/container-images/intel-gpu/Containerfile
index a42e62a2e..fec5d967e 100644
--- a/container-images/intel-gpu/Containerfile
+++ b/container-images/intel-gpu/Containerfile
@@ -18,11 +18,13 @@ RUN dnf install -y procps-ng python3 python3-pip python3-devel intel-level-zero
 RUN useradd llama-user -u 10000 -d /home/llama-user -s /bin/bash && \
 groupmod -a -U llama-user render && \
 groupmod -a -U llama-user video && \
-echo ". /opt/intel/oneapi/setvars.sh" >> "/home/llama-user/.zshrc" && \
-echo ". /opt/intel/oneapi/setvars.sh" >> "/home/llama-user/.bashrc" && \
 chown llama-user:llama-user -R /home/llama-user && \
 /usr/bin/build_rag.sh rag
 
 USER 10000
 
+COPY --chmod=755 intel-gpu/entrypoint.sh /usr/bin
+
+ENTRYPOINT ["/usr/bin/entrypoint.sh"]
+
 CMD [ "tail", "-f", "/dev/null" ]
diff --git a/container-images/intel-gpu/entrypoint.sh b/container-images/intel-gpu/entrypoint.sh
new file mode 100755
index 000000000..851c7b673
--- /dev/null
+++ b/container-images/intel-gpu/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1091
+
+source /opt/intel/oneapi/setvars.sh
+
+exec "$@"
+
diff --git a/ramalama/model.py b/ramalama/model.py
index e7e8fbc56..233022a15 100644
--- a/ramalama/model.py
+++ b/ramalama/model.py
@@ -199,8 +199,6 @@ def get_base_conman_args(self, args, name):
             name,
             "--env=HOME=/tmp",
             "--init",
-            "--entrypoint",
-            "",
         ]
 
     def add_privileged_options(self, conman_args, args):