diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd542858..2126fe29 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -117,7 +117,7 @@ jobs:
             -e KAFKA_BOOTSTRAP_SERVERS="kafka:9093" \
             -e KAFKA_GROUP_ID="launchpad-test-ci" \
             -e KAFKA_TOPICS="preprod-artifact-events" \
-            --entrypoint python launchpad-test -m pytest -n auto tests/ --ignore=tests/e2e -v
+            launchpad-test python -m pytest -n auto tests/ --ignore=tests/e2e -v
 
       - name: Show Kafka logs on failure
         if: failure()
@@ -133,7 +133,7 @@ jobs:
             -e LAUNCHPAD_ENV=development \
             -e LAUNCHPAD_HOST=localhost \
             -e LAUNCHPAD_PORT=2218 \
-            launchpad-test --help
+            launchpad-test launchpad --help
 
   e2e:
     runs-on: ubuntu-latest
diff --git a/Dockerfile b/Dockerfile
index 79086e1d..be79b032 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,8 +112,5 @@ EXPOSE 2218
 ARG LAUNCHPAD_VERSION_SHA
 ENV LAUNCHPAD_VERSION_SHA=$LAUNCHPAD_VERSION_SHA
 
-# ENTRYPOINT/CMD split allows K8s deployments to override the subcommand via `args`.
-# - Serve mode (deployment.yaml): uses default CMD -> "launchpad serve"
-# - Worker mode (taskworker-deployment.yaml): overrides CMD via args -> "launchpad worker ..."
-ENTRYPOINT ["launchpad"]
-CMD ["serve"]
+# Default command
+CMD ["launchpad", "serve"]
diff --git a/devservices/config.yml b/devservices/config.yml
index 39b8cb30..24414903 100644
--- a/devservices/config.yml
+++ b/devservices/config.yml
@@ -26,6 +26,7 @@ services:
     ports:
       - 127.0.0.1:2218:2218 # Bind to localhost only - no external access
     command:
+      - launchpad
       - serve
       - --verbose
     healthcheck: