diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 4fc56610..78c5987c 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -3,10 +3,10 @@ name: Build and Deploy Image
 on:
   workflow_dispatch:
     inputs:
-      service:
-        description: 'Service to build and deploy'
-        required: true
-        default: 'aries-endorser-agent'
+      # service:
+      #   description: 'Service to build and deploy'
+      #   required: true
+      #   default: 'aries-endorser-agent'
       git_repo_url:
         description: 'Git repository URL'
         required: true
@@ -58,7 +58,7 @@ env:
 
 jobs:
   build:
-    if: (github.repository == 'bcgov/dts-endorser-service') || (github.event_name == 'workflow_dispatch')
+    if: (github.repository == 'bcgov/dts-endorser-service') || (github.event_name == 'workflow_dispatch' && github.event.inputs.service)
     name: Build Image
     permissions:
       packages: write