diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 12a493e0..ca42d055 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -11,10 +11,6 @@ on:
         description: 'Git repository URL'
         required: true
         default: 'hyperledger/aries-endorser-service'
-      endorser_agent_git_ref:
-       description: 'Git reference (branch or tag)'
-        required: false
-        default: ''
       endorser_agent_docker_file_path:
         description: 'Path to Dockerfile'
         required: true
@@ -43,78 +39,74 @@ on:
         description: 'Secret name for registry password'
         required: false
         default: 'ARTIFACTORY_PASSWORD'
-        endorser_db_git_repo_url:
-          description: 'Git repository URL'
-          required: true
-          default: 'hyperledger/aries-endorser-service'
-        endorser_db_git_ref:
-         description: 'Git reference (branch or tag)'
-          required: false
-          default: ''
-        endorser_db_docker_file_path:
-          description: 'Path to Dockerfile'
-          required: true
-          default: 'Dockerfile.acapy'
-        endorser_db_source_context_dir:
-          description: 'Source context directory for the build'
-          required: true
-          default: 'docker/acapy'
-        endorser_db_source_image_registry:
-          description: 'Source image registry'
-          required: false
-          default: ''
-        endorser_db_source_image_name:
-          description: 'Source image name'
-          required: false
-          default: ''
-        endorser_db_source_image_tag:
-          description: 'Source image tag'
-          required: false
-          default: ''
-        endorser_db_registry_username_secret_name:
-          description: 'Secret name for registry username'
-          required: false
-          default: 'ARTIFACTORY_USERNAME'
-        endorser_db_registry_password_secret_name:
-          description: 'Secret name for registry password'
-          required: false
-          default: 'ARTIFACTORY_PASSWORD'
-        endorser_backup_git_repo_url:
-          description: 'Git repository URL'
-          required: true
-          default: 'hyperledger/aries-endorser-service'
-        endorser_backup_git_ref:
-          description: 'Git reference (branch or tag)'
-          required: false
-          default: ''
-        endorser_backup_docker_file_path:
-          description: 'Path to Dockerfile'
-          required: true
-          default: 'Dockerfile.acapy'
-        endorser_backup_source_context_dir:
-          description: 'Source context directory for the build'
-          required: true
-          default: 'docker/acapy'
-        endorser_backup_source_image_registry:
-          description: 'Source image registry'
-          required: false
-          default: ''
-        endorser_backup_source_image_name:
-          description: 'Source image name'
-          required: false
-          default: ''
-        endorser_backup_source_image_tag:
-          description: 'Source image tag'
-          required: false
-          default: ''
-        endorser_backup_registry_username_secret_name:
-          description: 'Secret name for registry username'
-          required: false
-          default: 'ARTIFACTORY_USERNAME'
-        endorser_backup_registry_password_secret_name:
-          description: 'Secret name for registry password'
-          required: false
-          default: 'ARTIFACTORY_PASSWORD'
+      endorser_db_git_repo_url:
+        description: 'Git repository URL'
+        required: true
+        default: 'hyperledger/aries-endorser-service'
+      endorser_db_docker_file_path:
+        description: 'Path to Dockerfile'
+        required: true
+        default: 'Dockerfile.acapy'
+      endorser_db_source_context_dir:
+        description: 'Source context directory for the build'
+        required: true
+        default: 'docker/acapy'
+      endorser_db_source_image_registry:
+        description: 'Source image registry'
+        required: false
+        default: ''
+      endorser_db_source_image_name:
+        description: 'Source image name'
+        required: false
+        default: ''
+      endorser_db_source_image_tag:
+        description: 'Source image tag'
+        required: false
+        default: ''
+      endorser_db_registry_username_secret_name:
+        description: 'Secret name for registry username'
+        required: false
+        default: 'ARTIFACTORY_USERNAME'
+      endorser_db_registry_password_secret_name:
+        description: 'Secret name for registry password'
+        required: false
+        default: 'ARTIFACTORY_PASSWORD'
+      endorser_backup_git_repo_url:
+        description: 'Git repository URL'
+        required: true
+        default: 'hyperledger/aries-endorser-service'
+      endorser_backup_git_ref:
+        description: 'Git reference (branch or tag)'
+        required: false
+        default: ''
+      endorser_backup_docker_file_path:
+        description: 'Path to Dockerfile'
+        required: true
+        default: 'Dockerfile.acapy'
+      endorser_backup_source_context_dir:
+        description: 'Source context directory for the build'
+        required: true
+        default: 'docker/acapy'
+      endorser_backup_source_image_registry:
+        description: 'Source image registry'
+        required: false
+        default: ''
+      endorser_backup_source_image_name:
+        description: 'Source image name'
+        required: false
+        default: ''
+      endorser_backup_source_image_tag:
+        description: 'Source image tag'
+        required: false
+        default: ''
+      endorser_backup_registry_username_secret_name:
+        description: 'Secret name for registry username'
+        required: false
+        default: 'ARTIFACTORY_USERNAME'
+      endorser_backup_registry_password_secret_name:
+        description: 'Secret name for registry password'
+        required: false
+        default: 'ARTIFACTORY_PASSWORD'
   push:
     branches:
       - enhancement