diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 122c7d0b..06606a91 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -46,4 +46,4 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
     ./aws/install && \
     rm awscliv2.zip
 RUN rm -rf /var/lib/apt/lists/*
-ENTRYPOINT [ "/bin/bash", "-it" ]
\ No newline at end of file
+ENTRYPOINT [ "/bin/bash", "-l", "-c" ]
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 122c7d0b..06606a91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,4 +46,4 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
     ./aws/install && \
     rm awscliv2.zip
 RUN rm -rf /var/lib/apt/lists/*
-ENTRYPOINT [ "/bin/bash", "-it" ]
\ No newline at end of file
+ENTRYPOINT [ "/bin/bash", "-l", "-c" ]
\ No newline at end of file
diff --git a/silnlp/nmt/clearml_connection.py b/silnlp/nmt/clearml_connection.py
index c772c8ab..172a752d 100644
--- a/silnlp/nmt/clearml_connection.py
+++ b/silnlp/nmt/clearml_connection.py
@@ -48,7 +48,8 @@ def __post_init__(self) -> None:
             self._load_config()
 
             self.task.set_base_docker(
-                docker_image="nvidia/cuda:11.2.2-cudnn8-runtime-ubuntu20.04"
+                docker_image="ghcr.io/sillsdev/silnlp:latest",
+                docker_arguments="-v /home/clearml/.clearml/hf-cache:/root/.cache/huggingface"
             )
             if self.queue_name.lower() not in ("local", "locally"):
                 self.task.execute_remotely(queue_name=self.queue_name)