diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ccbd35..ec0a8df 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,9 +12,9 @@ env:
   PYTHONPATH: ${{ github.workspace }}/src
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  EXPERIMENT_IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-  MCP_CONTROLLER_IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/controller
-  MCP_RUNNER_IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner
+  EXPERIMENT_IMAGE: ghcr.io/${{ github.repository }}
+  MCP_CONTROLLER_IMAGE: ghcr.io/${{ github.repository }}/controller
+  MCP_RUNNER_IMAGE: ghcr.io/${{ github.repository }}/runner
 
 jobs:
   pytest:
@@ -154,7 +154,7 @@ jobs:
 
       - name: Run tests in container
         run: |
-          docker run --rm ad-research-experiment:ci pytest tests/ -q --cov=src --cov-report=xml
+          docker run --rm --entrypoint pytest ad-research-experiment:ci tests/ -q --cov=src --cov-report=xml
 
   mcp-docker-push:
     name: Push Docker Images