diff --git a/.github/workflows/trigger-antithesis-runs.yml b/.github/workflows/trigger-antithesis-avalanchego.yml
similarity index 56%
rename from .github/workflows/trigger-antithesis-runs.yml
rename to .github/workflows/trigger-antithesis-avalanchego.yml
index f893b88da9ec..23a972d778ae 100644
--- a/.github/workflows/trigger-antithesis-runs.yml
+++ b/.github/workflows/trigger-antithesis-avalanchego.yml
@@ -1,4 +1,4 @@
-name: Trigger Antithesis Test Runs
+name: Trigger Antithesis Avalanchego Setup
 
 on:
   # TODO(marun) Add a schedule to execute regularly
@@ -10,8 +10,7 @@ on:
         required: true
         type: string
       recipients:
-        description: 'Email recipients to send the test report to'
-        default: ${{ secrets.ANTITHESIS_RECIPIENTS }}
+        description: 'Comma-seperated email addresses to send the test report to'
         required: true
         type: string
       image_tag:
@@ -37,19 +36,3 @@ jobs:
           email_recipients: ${{ github.event.inputs.recipients || secrets.ANTITHESIS_RECIPIENTS }}
           additional_parameters: |-
             custom.duration=${{ github.event.inputs.duration || '0.5' }}
-  antithesis_xsvm:
-    name: Run Antithesis XSVM Test Setup
-    runs-on: ubuntu-latest
-    steps:
-      - uses: antithesishq/antithesis-trigger-action@v0.5
-        with:
-          notebook_name: avalanche
-          tenant: avalanche
-          username: ${{ secrets.ANTITHESIS_USERNAME }}
-          password: ${{ secrets.ANTITHESIS_PASSWORD }}
-          github_token: ${{ secrets.ANTITHESIS_GH_PAT }}
-          config_image: antithesis-xsvm-config@${{ github.event.inputs.image_tag || 'latest' }}
-          images: antithesis-xsvm-workload@${{ github.event.inputs.image_tag || 'latest' }};antithesis-xsvm-node@${{ github.event.inputs.image_tag || 'latest' }}
-          email_recipients: ${{ github.event.inputs.recipients || secrets.ANTITHESIS_RECIPIENTS }}
-          additional_parameters: |-
-            custom.duration=${{ github.event.inputs.duration || '0.5' }}
diff --git a/.github/workflows/trigger-antithesis-xsvm.yml b/.github/workflows/trigger-antithesis-xsvm.yml
new file mode 100644
index 000000000000..02b52566eb69
--- /dev/null
+++ b/.github/workflows/trigger-antithesis-xsvm.yml
@@ -0,0 +1,38 @@
+name: Trigger Antithesis XSVM Setup
+
+on:
+  # TODO(marun) Add a schedule to execute regularly
+  workflow_dispatch:
+    inputs:
+      duration:
+        description: 'The duration to run the test for'
+        default: '0.5'
+        required: true
+        type: string
+      recipients:
+        description: 'Comma-seperated email addresses to send the test report to'
+        required: true
+        type: string
+      image_tag:
+        description: 'The image tag to target'
+        default: latest
+        required: true
+        type: string
+
+jobs:
+  antithesis_xsvm:
+    name: Run Antithesis XSVM Test Setup
+    runs-on: ubuntu-latest
+    steps:
+      - uses: antithesishq/antithesis-trigger-action@v0.5
+        with:
+          notebook_name: avalanche
+          tenant: avalanche
+          username: ${{ secrets.ANTITHESIS_USERNAME }}
+          password: ${{ secrets.ANTITHESIS_PASSWORD }}
+          github_token: ${{ secrets.ANTITHESIS_GH_PAT }}
+          config_image: antithesis-xsvm-config@${{ github.event.inputs.image_tag || 'latest' }}
+          images: antithesis-xsvm-workload@${{ github.event.inputs.image_tag || 'latest' }};antithesis-xsvm-node@${{ github.event.inputs.image_tag || 'latest' }}
+          email_recipients: ${{ github.event.inputs.recipients || secrets.ANTITHESIS_RECIPIENTS }}
+          additional_parameters: |-
+            custom.duration=${{ github.event.inputs.duration || '0.5' }}