diff --git a/.github/workflows/run-flyway-command.yml b/.github/workflows/run-flyway-command.yml
index d6a391295..5ae8b00ee 100644
--- a/.github/workflows/run-flyway-command.yml
+++ b/.github/workflows/run-flyway-command.yml
@@ -4,18 +4,15 @@ on:
   workflow_dispatch:
     inputs:
       environment:
-        type: string
+        type: choice
         required: true
-        description: AWS environment - one of DEV, TEST, FEATURE, BUILD, STAGING, INTEGRATION or PRODUCTION
+        description: AWS environment
+        options: [DEV, TEST, FEATURE, BUILD, STAGING, INTEGRATION, PRODUCTION]
       command:
         type: choice
         required: true
         description: Flyway command to run
-        options:
-          - info
-          - migrate
-          - clean
-          - clean migrate
+        options: [info, migrate, clean, clean migrate]
 
 jobs:
   validate-environment:
diff --git a/.github/workflows/upload-athena-files.yml b/.github/workflows/upload-athena-files.yml
index 5bdd20091..732aafee9 100644
--- a/.github/workflows/upload-athena-files.yml
+++ b/.github/workflows/upload-athena-files.yml
@@ -9,9 +9,10 @@ on:
   workflow_dispatch:
     inputs:
       environment:
-        type: string
+        type: choice
         required: true
-        description: AWS environment - one of DEV, TEST, FEATURE, BUILD, STAGING, INTEGRATION or PRODUCTION
+        description: AWS environment
+        options: [DEV, TEST, FEATURE, BUILD, STAGING, INTEGRATION, PRODUCTION]
 
 jobs:
   validate-environment: