diff --git a/service/deployment/entrypoint b/service/deployment/entrypoint
index 7d7f9d97..9a1ee9b1 100755
--- a/service/deployment/entrypoint
+++ b/service/deployment/entrypoint
@@ -37,8 +37,19 @@ esac
 
 WORKFLOW_PATH="$SERVICE_PATH/deployment/workflows/$ACTION_TO_EXECUTE.yaml"
 
+NEEDS_PARAMS=true
+case "$SERVICE_ACTION" in
+  "switch-traffic"|"kill-instances"|"diagnose-deployment")
+    NEEDS_PARAMS=false
+    ;;
+esac
+
 CMD="np service workflow exec --workflow $WORKFLOW_PATH --build-context --include-secrets"
 
+if [ "$NEEDS_PARAMS" = "false" ] && np service workflow exec --help 2>&1 | grep -q "\-\-no-params"; then
+  CMD="$CMD --no-params"
+fi
+
 IFS=',' read -ra OVERRIDE_PATHS <<< "$OVERRIDES_PATH"
 for path in "${OVERRIDE_PATHS[@]}"; do
   # Trim whitespace
diff --git a/service/deployment/tests/entrypoint.bats b/service/deployment/tests/entrypoint.bats
new file mode 100644
index 00000000..fac10a8f
--- /dev/null
+++ b/service/deployment/tests/entrypoint.bats
@@ -0,0 +1,185 @@
+#!/usr/bin/env bats
+# =============================================================================
+# Unit tests for service/deployment/entrypoint - --no-params flag behavior
+# =============================================================================
+
+setup() {
+  export PROJECT_ROOT="$(cd "$BATS_TEST_DIRNAME/../../.." && pwd)"
+  source "$PROJECT_ROOT/testing/assertions.sh"
+
+  export SCOPE_ID="scope-123"
+  export DEPLOYMENT_ID="deploy-456"
+  export SERVICE_PATH="/tmp/test-service-path"
+  export OVERRIDES_PATH=""
+
+  mkdir -p "$SERVICE_PATH/deployment/workflows"
+  touch "$SERVICE_PATH/deployment/workflows/initial.yaml"
+  touch "$SERVICE_PATH/deployment/workflows/blue_green.yaml"
+  touch "$SERVICE_PATH/deployment/workflows/switch_traffic.yaml"
+  touch "$SERVICE_PATH/deployment/workflows/rollback.yaml"
+  touch "$SERVICE_PATH/deployment/workflows/finalize.yaml"
+  touch "$SERVICE_PATH/deployment/workflows/delete.yaml"
+  touch "$SERVICE_PATH/deployment/workflows/diagnose.yaml"
+  touch "$SERVICE_PATH/deployment/workflows/kill_instances.yaml"
+
+  export NP_EXECUTED_CMD=""
+  export NP_HELP_SUPPORTS_NO_PARAMS="true"
+}
+
+teardown() {
+  rm -rf "$SERVICE_PATH"
+  unset -f np
+}
+
+mock_np() {
+  np() {
+    if [[ "$*" == *"--help"* ]]; then
+      if [ "$NP_HELP_SUPPORTS_NO_PARAMS" = "true" ]; then
+        echo "  --no-params    Skip parameter fetching"
+      fi
+      return 0
+    fi
+    export NP_EXECUTED_CMD="np $*"
+    return 0
+  }
+  export -f np
+}
+
+# =============================================================================
+# Actions that SHOULD include --no-params (when CLI supports it)
+# =============================================================================
+
+@test "deployment entrypoint: switch-traffic includes --no-params when CLI supports it" {
+  mock_np
+  export SERVICE_ACTION="switch-traffic"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--no-params"
+}
+
+@test "deployment entrypoint: kill-instances includes --no-params when CLI supports it" {
+  mock_np
+  export SERVICE_ACTION="kill-instances"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--no-params"
+}
+
+@test "deployment entrypoint: diagnose-deployment includes --no-params when CLI supports it" {
+  mock_np
+  export SERVICE_ACTION="diagnose-deployment"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--no-params"
+}
+
+# =============================================================================
+# Actions that SHOULD NOT include --no-params
+# =============================================================================
+
+@test "deployment entrypoint: start-initial does NOT include --no-params" {
+  mock_np
+  export SERVICE_ACTION="start-initial"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"--no-params"* ]]
+}
+
+@test "deployment entrypoint: start-blue-green does NOT include --no-params" {
+  mock_np
+  export SERVICE_ACTION="start-blue-green"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"--no-params"* ]]
+}
+
+@test "deployment entrypoint: rollback-deployment does NOT include --no-params" {
+  mock_np
+  export SERVICE_ACTION="rollback-deployment"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"--no-params"* ]]
+}
+
+@test "deployment entrypoint: finalize-blue-green does NOT include --no-params" {
+  mock_np
+  export SERVICE_ACTION="finalize-blue-green"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"--no-params"* ]]
+}
+
+@test "deployment entrypoint: delete-deployment does NOT include --no-params" {
+  mock_np
+  export SERVICE_ACTION="delete-deployment"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"--no-params"* ]]
+}
+
+# =============================================================================
+# Backward compatibility - old CLI without --no-params support
+# =============================================================================
+
+@test "deployment entrypoint: switch-traffic omits --no-params when CLI does not support it" {
+  export NP_HELP_SUPPORTS_NO_PARAMS="false"
+  mock_np
+  export SERVICE_ACTION="switch-traffic"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"--no-params"* ]]
+}
+
+@test "deployment entrypoint: kill-instances omits --no-params when CLI does not support it" {
+  export NP_HELP_SUPPORTS_NO_PARAMS="false"
+  mock_np
+  export SERVICE_ACTION="kill-instances"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"--no-params"* ]]
+}
+
+# =============================================================================
+# Edge cases
+# =============================================================================
+
+@test "deployment entrypoint: unknown action fails" {
+  mock_np
+  export SERVICE_ACTION="unknown-action"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 1 ]
+  assert_contains "$output" "Unknown action"
+}
+
+@test "deployment entrypoint: --build-context and --include-secrets always present" {
+  mock_np
+  export SERVICE_ACTION="switch-traffic"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--build-context"
+  assert_contains "$output" "--include-secrets"
+}
diff --git a/service/scope/entrypoint b/service/scope/entrypoint
index 721b1188..12b215a1 100755
--- a/service/scope/entrypoint
+++ b/service/scope/entrypoint
@@ -47,6 +47,10 @@ fi
 
 CMD="np service workflow exec --workflow $WORKFLOW_PATH --build-context --include-secrets"
 
+if np service workflow exec --help 2>&1 | grep -q "\-\-no-params"; then
+  CMD="$CMD --no-params"
+fi
+
 IFS=',' read -ra OVERRIDE_PATHS <<< "$OVERRIDES_PATH"
 for path in "${OVERRIDE_PATHS[@]}"; do
   # Trim whitespace
diff --git a/service/scope/tests/entrypoint.bats b/service/scope/tests/entrypoint.bats
new file mode 100644
index 00000000..afcc5148
--- /dev/null
+++ b/service/scope/tests/entrypoint.bats
@@ -0,0 +1,135 @@
+#!/usr/bin/env bats
+# =============================================================================
+# Unit tests for service/scope/entrypoint - --no-params flag behavior
+# =============================================================================
+
+setup() {
+  export PROJECT_ROOT="$(cd "$BATS_TEST_DIRNAME/../../.." && pwd)"
+  source "$PROJECT_ROOT/testing/assertions.sh"
+
+  export SCOPE_ID="scope-123"
+  export SERVICE_PATH="/tmp/test-service-path"
+  export OVERRIDES_PATH=""
+
+  mkdir -p "$SERVICE_PATH/scope/workflows"
+  touch "$SERVICE_PATH/scope/workflows/create.yaml"
+  touch "$SERVICE_PATH/scope/workflows/update.yaml"
+  touch "$SERVICE_PATH/scope/workflows/delete.yaml"
+  touch "$SERVICE_PATH/scope/workflows/diagnose.yaml"
+  touch "$SERVICE_PATH/scope/workflows/restart-pods.yaml"
+  touch "$SERVICE_PATH/scope/workflows/pause-autoscaling.yaml"
+  touch "$SERVICE_PATH/scope/workflows/resume-autoscaling.yaml"
+  touch "$SERVICE_PATH/scope/workflows/set-desired-instance-count.yaml"
+
+  export NP_HELP_SUPPORTS_NO_PARAMS="true"
+}
+
+teardown() {
+  rm -rf "$SERVICE_PATH"
+  unset -f np
+}
+
+mock_np() {
+  np() {
+    if [[ "$*" == *"--help"* ]]; then
+      if [ "$NP_HELP_SUPPORTS_NO_PARAMS" = "true" ]; then
+        echo "  --no-params    Skip parameter fetching"
+      fi
+      return 0
+    fi
+    export NP_EXECUTED_CMD="np $*"
+    return 0
+  }
+  export -f np
+}
+
+# =============================================================================
+# All scope actions SHOULD include --no-params (when CLI supports it)
+# =============================================================================
+
+@test "scope entrypoint: create includes --no-params" {
+  mock_np
+  export SERVICE_ACTION="create-scope"
+  export SERVICE_ACTION_TYPE="create"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--no-params"
+}
+
+@test "scope entrypoint: update includes --no-params" {
+  mock_np
+  export SERVICE_ACTION="update-scope"
+  export SERVICE_ACTION_TYPE="update"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--no-params"
+}
+
+@test "scope entrypoint: delete includes --no-params" {
+  mock_np
+  export SERVICE_ACTION="delete-scope"
+  export SERVICE_ACTION_TYPE="custom"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--no-params"
+}
+
+@test "scope entrypoint: diagnose includes --no-params" {
+  mock_np
+  export SERVICE_ACTION="diagnose-scope"
+  export SERVICE_ACTION_TYPE="custom"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--no-params"
+}
+
+@test "scope entrypoint: restart-pods includes --no-params" {
+  mock_np
+  export SERVICE_ACTION="restart-pods"
+  export SERVICE_ACTION_TYPE="custom"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--no-params"
+}
+
+# =============================================================================
+# Backward compatibility - old CLI without --no-params support
+# =============================================================================
+
+@test "scope entrypoint: omits --no-params when CLI does not support it" {
+  export NP_HELP_SUPPORTS_NO_PARAMS="false"
+  mock_np
+  export SERVICE_ACTION="create-scope"
+  export SERVICE_ACTION_TYPE="create"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"--no-params"* ]]
+}
+
+# =============================================================================
+# Core flags always present
+# =============================================================================
+
+@test "scope entrypoint: --build-context and --include-secrets always present" {
+  mock_np
+  export SERVICE_ACTION="create-scope"
+  export SERVICE_ACTION_TYPE="create"
+
+  run bash "$BATS_TEST_DIRNAME/../entrypoint"
+
+  [ "$status" -eq 0 ]
+  assert_contains "$output" "--build-context"
+  assert_contains "$output" "--include-secrets"
+}