diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml
index 18627ec6b..0102dbd5e 100644
--- a/salt/soc/defaults.yaml
+++ b/salt/soc/defaults.yaml
@@ -1497,13 +1497,16 @@ soc:
           systemPromptAddendum: ""
           systemPromptAddendumMaxLength: 50000
           adapters:
-            securityonion_ai_cloud:
+            - name: SOAI
+              protocol: securityonion_ai_cloud
               apiUrl: https://onionai.securityonion.net
               healthTimeoutSeconds: 5
-            gemini:
+            - name: Gemini
+              protocol: gemini
               apiKey: ""
               serviceAccountJSON: ""
               serviceAccountLocation: ""
+              healthTimeoutSeconds: 5
         salt:
           queueDir: /opt/sensoroni/queue
           timeoutMs: 45000
@@ -2665,7 +2668,7 @@ soc:
               contextLimitLarge: 1000000
               lowBalanceColorAlert: 500000
               enabled: true
-              adapter: securityonion_ai_cloud
+              adapter: SOAI
             - id: qwen-235b
               displayName: QWEN 235B ($)
               origin: China
@@ -2673,4 +2676,4 @@ soc:
               contextLimitLarge: 256000
               lowBalanceColorAlert: 500000
               enabled: true
-              adapter: securityonion_ai_cloud
+              adapter: SOAI
diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml
index 025520ade..95a536f7d 100644
--- a/salt/soc/soc_soc.yaml
+++ b/salt/soc/soc_soc.yaml
@@ -660,25 +660,39 @@ soc:
             global: True
             advanced: True
           adapters:
-            securityonion_ai_cloud:
-              apiUrl:
-                description: The URL of the AI gateway.
-                global: True
-              healthTimeoutSeconds:
-                description: Timeout in seconds for the Onion AI health check.
-                global: True
-                advanced: True
-            gemini:
-              apiKey:
-                description: A Google API key generated in Google AI Studio or the Google Cloud Console. Ignored if a service account and location are provided.
-                global: True
-              serviceAccountJSON:
-                description: The JSON file contents holding the credentials for a Google Service Account. Uses Vertex AI. Overrides apiKey if a service account and location are provided.
-                global: True
-                multiline: True
-              serviceAccountLocation:
-                description: The location of your project in Google Cloud. Overrides apiKey if a service account and location are provided. Example: us-central1
-                global: True
+            description: Configuration for AI adapters used by the Onion AI assistant.
+            global: True
+            advanced: True
+            forcedType: "[]{}"
+            syntax: json
+            uiElements:
+            - field: name
+              label: Adapter Name
+              regex: "^(?!.*@).+$"
+              regexFailureMessage: Adapter name cannot contain the '@' character
+              required: True
+            - field: protocol
+              label: Protocol
+              required: True
+              options:
+                - securityonion_ai_cloud
+                - gemini
+            - field: apiUrl
+              label: API URL
+              required: False
+            - field: apiKey
+              label: API Key
+              required: False
+            - field: serviceAccountJSON
+              label: Service Account JSON
+              required: False
+              multiline: True
+            - field: serviceAccountLocation
+              label: Service Account Location
+              required: False
+            - field: healthTimeoutSeconds
+              label: Health Timeout Seconds
+              required: False
       client:
         assistant:
           enabled: