diff --git a/charts/incubator/universal-media-server/Chart.yaml b/charts/incubator/universal-media-server/Chart.yaml
index 9314996718a..01b689284ba 100644
--- a/charts/incubator/universal-media-server/Chart.yaml
+++ b/charts/incubator/universal-media-server/Chart.yaml
@@ -1,17 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - MediaServer-Video
-    - MediaServer-Music
-    - MediaServer-Photos
 apiVersion: v2
+kubeVersion: ">=1.16.0-0"
+name: universal-media-server
+version: 0.0.28
 appVersion: "latest"
-dependencies:
-  - name: common
-    repository: https://library-charts.truecharts.org
-    version: 10.5.10
-deprecated: false
 description: "Universal Media Server is a DLNA-compliant UPnP Media Server. It is capable of sharing video, audio and images between most modern devices. It was originally based on PS3 Media Server by shagrath, in order to ensure greater stability and file-compatibility."
+type: application
+deprecated: false
 home: https://truecharts.org/docs/charts/incubator/universal-media-server
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/universal-media-server.png
 keywords:
@@ -19,15 +13,23 @@ keywords:
   - MediaServer-Video
   - MediaServer-Music
   - MediaServer-Photos
-kubeVersion: ">=1.16.0-0"
-maintainers:
-  - email: info@truecharts.org
-    name: TrueCharts
-    url: https://truecharts.org
-name: universal-media-server
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/universal-media-server
   - https://www.universalmediaserver.com/
   - https://hub.docker.com/r/universalmediaserver/ums
-type: application
-version: 0.0.27
+dependencies:
+  - name: common
+    repository: https://library-charts.truecharts.org
+    version: 10.5.10
+    # condition:
+maintainers:
+  - email: info@truecharts.org
+    name: TrueCharts
+    url: https://truecharts.org
+annotations:
+  truecharts.org/catagories: |
+    - MediaServer-Video
+    - MediaServer-Music
+    - MediaServer-Photos
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
diff --git a/charts/incubator/universal-media-server/questions.yaml b/charts/incubator/universal-media-server/questions.yaml
index 2a1c93ac488..93ca0714e6b 100644
--- a/charts/incubator/universal-media-server/questions.yaml
+++ b/charts/incubator/universal-media-server/questions.yaml
@@ -43,17 +43,17 @@ questions:
                                   schema:
                                     type: int
                                     default: 9001
-        - variable: port5002
-          label: 'port5002 service'
-          description: "Container Port 5002"
+        - variable: api
+          label: 'API service'
+          description: "Container Port API"
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
-                    - variable: port5002
-                      label: "port5002 Service Port Configuration"
+                    - variable: api
+                      label: "API Service Port Configuration"
                       schema:
                         additional_attrs: true
                         type: dict
@@ -63,7 +63,7 @@ questions:
                             description: "This port exposes the container port on the service"
                             schema:
                               type: int
-                              default: 5002
+                              default: 5001
                               required: true
 # Include{advancedPortTCP}
                                 - variable: targetPort
@@ -71,18 +71,18 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 5002
-        - variable: port1044
-          label: 'port1044 service'
-          description: "Container Port 1044"
+                                    default: 5001
+        - variable: sub
+          label: 'Sub service'
+          description: "Container Port Sub"
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
-                    - variable: port1044
-                      label: "port1044 Service Port Configuration"
+                    - variable: sub
+                      label: "Sub Service Port Configuration"
                       schema:
                         additional_attrs: true
                         type: dict
@@ -106,18 +106,18 @@ questions:
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: media
-          label: "media Storage"
-          description: "Container Path media"
+        - variable: config
+          label: "config Storage"
+          description: "Container Path root.configUMS"
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{persistenceBasic}
 # Include{persistenceAdvanced}
-        - variable: config
-          label: "config Storage"
-          description: "Container Path root.configUMS"
+        - variable: media
+          label: "media Storage"
+          description: "Container Path media"
           schema:
             additional_attrs: true
             type: dict
diff --git a/charts/incubator/universal-media-server/values.yaml b/charts/incubator/universal-media-server/values.yaml
index cf0fe6da815..ebd5ede1db9 100644
--- a/charts/incubator/universal-media-server/values.yaml
+++ b/charts/incubator/universal-media-server/values.yaml
@@ -1,21 +1,16 @@
-env: {}
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/universal-media-server
   tag: latest@sha256:3521d5a9b0f85f740c7450df35a9a03acd66f5b889ce5539837cb60e60b99a70
-persistence:
-  config:
-    enabled: true
-    mountPath: /root/.config/UMS/
-  media:
-    enabled: true
-    mountPath: /media
+
 podSecurityContext:
   runAsGroup: 0
   runAsUser: 0
+
 securityContext:
   readOnlyRootFilesystem: false
   runAsNonRoot: false
+
 service:
   main:
     ports:
@@ -23,22 +18,30 @@ service:
         port: 9001
         protocol: HTTP
         targetPort: 9001
-  port1044:
+  sub:
     enabled: true
     ports:
-      port1044:
+      sub:
         enabled: true
         port: 1044
         protocol: TCP
         targetPort: 1044
-  port5002:
+  api:
     enabled: true
     ports:
-      port5002:
+      api:
         enabled: true
-        port: 5002
+        port: 5001
         protocol: TCP
-        targetPort: 5002
+        targetPort: 5001
+
+persistence:
+  config:
+    enabled: true
+    mountPath: /root/.config/UMS/
+  media:
+    enabled: true
+    mountPath: /media
 
 portal:
   enabled: true