diff --git a/.github/workflows/skill-evals.yml b/.github/workflows/skill-evals.yml
index 09ebc2b9..e631d6a3 100644
--- a/.github/workflows/skill-evals.yml
+++ b/.github/workflows/skill-evals.yml
@@ -16,26 +16,17 @@ on:
   workflow_dispatch:
     inputs:
       structural:
-        description: Structural evals
-        type: choice
-        options:
-          - required
-          - off
-        default: required
+        description: Structural Tests
+        type: boolean
+        default: true
       routing:
-        description: Routing evals
-        type: choice
-        options:
-          - required
-          - off
-        default: off
+        description: Routing Tests
+        type: boolean
+        default: false
       behavioral:
-        description: Behavioral evals
-        type: choice
-        options:
-          - required
-          - off
-        default: off
+        description: Behavioral Tests
+        type: boolean
+        default: false
 
 permissions:
   contents: read
@@ -49,6 +40,6 @@ jobs:
     with:
       skills: TraceLens/Agent/Analysis/skills/analysis-orchestrator
       # Each step can be set to `required`, `optional`, or `off`.
-      structural: ${{ github.event.inputs.structural || 'required' }}
-      routing: ${{ github.event.inputs.routing || 'off' }}
-      behavioral: ${{ github.event.inputs.behavioral || 'off' }}
\ No newline at end of file
+      structural: ${{ github.event_name != 'workflow_dispatch' && 'required' || inputs.structural && 'required' || 'off' }}
+      routing: ${{ github.event_name == 'workflow_dispatch' && inputs.routing && 'required' || 'off' }}
+      behavioral: ${{ github.event_name == 'workflow_dispatch' && inputs.behavioral && 'required' || 'off' }}
\ No newline at end of file