diff --git a/CHANGES.md b/CHANGES.md
index 018050e..dd0bab2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@
 * Add NDVI sample notebook
 * Improve STAC output
 * Tweak CWL format (#24)
+* Use micromamba entry point in Docker image (#26)
 
 ## Changes in 0.1.0
 
diff --git a/xcengine/core.py b/xcengine/core.py
index 7836007..d4dab4d 100755
--- a/xcengine/core.py
+++ b/xcengine/core.py
@@ -148,7 +148,8 @@ def create_cwl(self, image_tag: str) -> dict[str, Any]:
                         "DockerRequirement": {"dockerPull": image_tag}
                     },
                     "baseCommand": [
-                        "python3",
+                        "/usr/local/bin/_entrypoint.sh",
+                        "python",
                         "/home/mambauser/execute.py",
                     ],
                     "arguments": ["--batch", "--eoap"],
@@ -280,7 +281,7 @@ def _build_image(self) -> docker.models.images.Image:
         COPY parameters.yaml parameters.yaml
         COPY parameters.py parameters.py
         COPY util.py util.py
-        CMD python execute.py
+        ENTRYPOINT ["/usr/local/bin/_entrypoint.sh", "python", "/home/mambauser/execute.py"]
         """
         )
         with open(self.build_dir / "Dockerfile", "w") as fh: