diff --git a/client/src/pages/actions/Show.tsx b/client/src/pages/actions/Show.tsx
index f57afa4..60ec72c 100644
--- a/client/src/pages/actions/Show.tsx
+++ b/client/src/pages/actions/Show.tsx
@@ -12,7 +12,7 @@ import { Show } from '@refinedev/mui'
 import type { IChangeEvent } from '@rjsf/core'
 import { withTheme } from '@rjsf/core'
 import { Theme } from '@rjsf/mui'
-import type { RJSFSchema } from '@rjsf/utils'
+import type { RJSFSchema, UiSchema } from '@rjsf/utils'
 import validator from '@rjsf/validator-ajv8'
 import type { FC } from 'react'
 import { useState } from 'react'
@@ -22,6 +22,7 @@ import { RunningActionsList } from '../../components/RunningActionsList'
 // @todo move to types
 interface IActionData extends BaseRecord {
   jsonschema: RJSFSchema
+  uischema: UiSchema
 }
 
 interface IFormValues {
@@ -52,6 +53,8 @@ export const ActionShow: FC<IResourceComponentsProps> = () => {
 
   const jsonschema = queryResult?.data?.data?.jsonschema
 
+  const uischema = queryResult?.data?.data?.uischema?.uiSchema || {}
+
   if (jsonschema) {
     // @todo I actually don't know for the moment how to overcome error
     //  "no schema with key or ref" produced when schema is defined.
@@ -117,7 +120,12 @@ export const ActionShow: FC<IResourceComponentsProps> = () => {
         }}
       />
       {jsonschema && (
-        <Form schema={jsonschema} validator={validator} onSubmit={onSubmit}>
+        <Form
+          schema={jsonschema}
+          uiSchema={uischema}
+          validator={validator}
+          onSubmit={onSubmit}
+        >
           <div>
             <Button variant="contained" type="submit" disabled={actionRunning}>
               Submit
diff --git a/example/rjsf/actions/arrays/action.yaml b/example/rjsf/actions/arrays/action.yaml
new file mode 100644
index 0000000..c2126f2
--- /dev/null
+++ b/example/rjsf/actions/arrays/action.yaml
@@ -0,0 +1,10 @@
+action:
+  title: RJSF Example of Arrays
+  description: RJSF Arrays arguments
+  image: alpine:latest
+  command: ["sh", "-c", "for i in $(seq 60); do echo $$i; sleep 1; done"]
+  arguments:
+    - name: optarr
+      title: Array
+      description: Some additional info for option
+      type: array
\ No newline at end of file
diff --git a/example/rjsf/actions/enumeration/action.yaml b/example/rjsf/actions/enumeration/action.yaml
index fb19739..0f3317a 100644
--- a/example/rjsf/actions/enumeration/action.yaml
+++ b/example/rjsf/actions/enumeration/action.yaml
@@ -11,9 +11,4 @@ action:
     - name: radio
       title: Radio
       type: string
-      enum: [ Ola, Hello, Bonjour, Buongiorno, GutenTag ]
-    - name: buttonGroup
-      type: string
-      enum: [ Ola, Hello, Bonjour, Buongiorno, GutenTag ]
-      default: Ola
-      description: With default value set
+      enum: [ Ola, Hello, Bonjour, Buongiorno, GutenTag ]
\ No newline at end of file
diff --git a/example/rjsf/actions/enumeration/ui-schema.yaml b/example/rjsf/actions/enumeration/ui-schema.yaml
index 32ccf8e..2338678 100644
--- a/example/rjsf/actions/enumeration/ui-schema.yaml
+++ b/example/rjsf/actions/enumeration/ui-schema.yaml
@@ -1,5 +1,4 @@
 uiSchema:
-  buttonGroup:
-    'ui:widget': button
-  radio:
-    'ui:widget': radio
+  arguments:
+    radio:
+      'ui:widget': radio
diff --git a/example/rjsf/actions/numbers/ui-schema.yaml b/example/rjsf/actions/numbers/ui-schema.yaml
index 523cad7..6737b15 100644
--- a/example/rjsf/actions/numbers/ui-schema.yaml
+++ b/example/rjsf/actions/numbers/ui-schema.yaml
@@ -1,5 +1,6 @@
 uiSchema:
-  range:
-    'ui:widget': range
-  rangeConstrained:
-    'ui:widget': range
+  arguments:
+    range:
+      'ui:widget': range
+    rangeConstrained:
+      'ui:widget': range
diff --git a/example/rjsf/actions/strings/ui-schema.yaml b/example/rjsf/actions/strings/ui-schema.yaml
index 6d6d848..f6f9fcf 100644
--- a/example/rjsf/actions/strings/ui-schema.yaml
+++ b/example/rjsf/actions/strings/ui-schema.yaml
@@ -1,6 +1,7 @@
 uiSchema:
-  textArea:
-    'ui:widget': textarea
-    'ui:placeholder': This is a placeholder
-  color:
-    'ui:widget': color
+  arguments:
+    textArea:
+      'ui:widget': textarea
+      'ui:placeholder': This is a placeholder
+    color:
+      'ui:widget': color
diff --git a/server/api.go b/server/api.go
index 1a56841..9a6776e 100644
--- a/server/api.go
+++ b/server/api.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/launchrctl/launchr"
 	"github.com/launchrctl/launchr/pkg/action"
+	"gopkg.in/yaml.v3"
 )
 
 type launchrServer struct {
@@ -185,11 +186,32 @@ func apiActionFull(baseURL string, a *action.Action) ActionFull {
 	jsonschema := a.JSONSchema()
 	jsonschema.ID = fmt.Sprintf("%s/actions/%s/schema.json", baseURL, url.QueryEscape(a.ID))
 	def := a.ActionDef()
+
+	var resultMap map[string]interface{}
+
+	yamlData, err := os.ReadFile(fmt.Sprintf("%s/ui-schema.yaml", a.Dir()))
+	if err != nil {
+		if os.IsNotExist(err) {
+			fmt.Println("Info: ui-schema.yaml not found, using empty UISchema")
+			resultMap = map[string]interface{}{}
+		} else {
+			panic(err)
+		}
+	} else {
+		var data interface{}
+		err = yaml.Unmarshal(yamlData, &data)
+		if err != nil {
+			panic(err)
+		}
+		resultMap, _ = data.(map[string]interface{})
+	}
+
 	return ActionFull{
 		ID:          a.ID,
 		Title:       def.Title,
 		Description: def.Description,
 		JSONSchema:  jsonschema,
+		UISchema:    resultMap,
 	}
 }
 
diff --git a/server/openapi.gen.go b/server/openapi.gen.go
index e683c53..d04c965 100644
--- a/server/openapi.gen.go
+++ b/server/openapi.gen.go
@@ -29,10 +29,11 @@ const (
 
 // ActionFull defines model for ActionFull.
 type ActionFull struct {
-	Description string            `json:"description"`
-	ID          string            `json:"id"`
-	JSONSchema  jsonschema.Schema `json:"jsonschema"`
-	Title       string            `json:"title"`
+	Description string                 `json:"description"`
+	ID          string                 `json:"id"`
+	JSONSchema  jsonschema.Schema      `json:"jsonschema"`
+	Title       string                 `json:"title"`
+	UISchema    map[string]interface{} `json:"uischema,omitempty"`
 }
 
 // ActionRunInfo defines model for ActionRunInfo.
@@ -530,25 +531,26 @@ func HandlerWithOptions(si ServerInterface, options ChiServerOptions) http.Handl
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"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",
+	"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",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/server/openapi.yaml b/server/openapi.yaml
index 621d852..1a1a6e6 100644
--- a/server/openapi.yaml
+++ b/server/openapi.yaml
@@ -200,6 +200,11 @@ components:
               x-go-type: "jsonschema.Schema"
               x-go-type-import:
                 path: "github.com/launchrctl/launchr/pkg/jsonschema"
+            uischema:
+              type: object
+              x-go-name: "UISchema"
+              x-go-type: "map[string]interface{}"
+              x-go-type-skip-optional-pointer: true
     ActionRunParams:
       allOf:
         - type: object