diff --git a/.github/docs/development/questions-yaml.md b/.github/docs/development/questions-yaml.md
index 5dc2476af36..263706ca76a 100644
--- a/.github/docs/development/questions-yaml.md
+++ b/.github/docs/development/questions-yaml.md
@@ -156,53 +156,3 @@ They are called general options, because they affect the basic functionalities o
                 schema:
                   type: string
 ```
-
-##### Main Service
-
-Services in Kubernetes (the underlaying framework in TrueNAS SCALE), are (simply put) internal loadbalancers. Besides being load balancers, they are always guaranteed to be reachable by (internal!) DNS name and (in some cases) prevent traffic from reaching your App when the healthcheck isn't finished yet (or is failing).
-
-Every App is required to have a main service, the primary thing that users (or other Apps!) connect with. No mater if it's a webUI, an API, a database connection or something totally else, A service is always required.
-
-Please keep in mind that every App is different, some just have one service (the primary one) and others need more (which get defined in `appAdditionalService`). Every App also uses different ports, so please alter accordingly.
-
-```
-  - variable: service
-    group: "Networking"
-    label: "Configure Service"
-    schema:
-      type: dict
-      attrs:
-        - variable: type
-          label: "Service type"
-          schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
-              - variable: port
-                label: "Port configuration"
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: port
-                      label: "container port"
-                      schema:
-                        type: int
-                        default: 80
-                        editable: false
-                    - variable: nodePort
-                      label: "Node Port to expose for UI"
-                      schema:
-                        type: int
-                        min: 9000
-                        max: 65535
-                        default: 36052
-                        required: true
-```
-
-_ Note: Our final main service format has not been fully completed as of yet, this might change the above snipped considerably_
diff --git a/.github/docs/development/services.md b/.github/docs/development/services.md
new file mode 100644
index 00000000000..d09b1c05e99
--- /dev/null
+++ b/.github/docs/development/services.md
@@ -0,0 +1,147 @@
+# Services
+
+Every App needs to be exposed to something, either an UI, API or other containers.However with Kubernetes we don't directly connect to the containers running the App, because those might be on another node or there might be multiple "high available" containers for the App. Instead we use what is called `Services`. Services are simply put "Internal Load-Balancers", they also guaranteed to be reachable by (internal!) DNS name and (in some cases) prevent traffic from reaching your App when the healthcheck isn't finished yet (or is failing).
+
+### Two kinds of services
+
+##### Main Service
+
+Every App is required to have a main service, the primary thing that users (or other Apps!) connect with. No mater if it's a webUI, an API, a database connection or something totally else, A service is always required.
+
+Please keep in mind that every App is different, some just have one service (which *ALWAYS* has to be called `main`) and others need more (which each has to have an unique name). Every App also uses different ports, so please alter accordingly.
+
+```
+  - variable: services
+    group: "Networking"
+    label: "Configure Service"
+    schema:
+      type: dict
+      attrs:
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                 label: "Enable the service"
+                 schema:
+                   type: boolean
+                   default: true
+                   hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+              - variable: port
+                label: "Port configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
+                    - variable: port
+                      label: "container port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: true
+                    - variable: nodePort
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
+                      schema:
+                        type: int
+                        min: 9000
+                        max: 65535
+                        default: 36052
+                        required: true
+```
+
+##### Unlimited custom services
+
+in some edgecases users might need or want to have the option to add unlimited custom Services. While we _highly_ suggest not doing so, these services can be added with the following standardised template:
+
+```
+  - variable: additionalServices
+    label: "Custom Services"
+    group: "Networking"
+    schema:
+      type: list
+      default: []
+      items:
+        - variable: additionalService
+          label: "Custom Service"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                 label: "Enable the service"
+                 schema:
+                   type: boolean
+                   default: true
+                   hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+              - variable: port
+                label: "Port configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: port
+                      label: "container port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: true
+                    - variable: nodePort
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
+                      schema:
+                        type: int
+                        min: 9000
+                        max: 65535
+                        default: 36052
+                        required: true
+
+```
diff --git a/.tools/tests/charts/common-test_spec.rb b/.tools/tests/charts/common-test_spec.rb
index 9b091269d9c..6ba757de127 100644
--- a/.tools/tests/charts/common-test_spec.rb
+++ b/.tools/tests/charts/common-test_spec.rb
@@ -142,49 +142,55 @@ class Test < ChartTest
 
       it 'port name can be overridden' do
         values = {
-          service: {
-            port: {
-              name: 'server'
-            }
+          services: {
+		    main: {
+              port: {
+                name: 'server'
+              }
+			}
           }
         }
         chart.value values
         jq('.spec.ports[0].port', resource('Service')).must_equal default_port
-        jq('.spec.ports[0].targetPort', resource('Service')).must_equal values[:service][:port][:name]
-        jq('.spec.ports[0].name', resource('Service')).must_equal values[:service][:port][:name]
+        jq('.spec.ports[0].targetPort', resource('Service')).must_equal values[:services][:main][:port][:name]
+        jq('.spec.ports[0].name', resource('Service')).must_equal values[:services][:main][:port][:name]
         jq('.spec.template.spec.containers[0].ports[0].containerPort', resource('Deployment')).must_equal default_port
-        jq('.spec.template.spec.containers[0].ports[0].name', resource('Deployment')).must_equal values[:service][:port][:name]
+        jq('.spec.template.spec.containers[0].ports[0].name', resource('Deployment')).must_equal values[:services][:main][:port][:name]
       end
 
       it 'targetPort can be overridden' do
         values = {
-          service: {
-            port: {
-              targetPort: 80
-            }
+          services: {
+		    main: {
+              port: {
+                targetPort: 80
+              }
+			}
           }
         }
         chart.value values
         jq('.spec.ports[0].port', resource('Service')).must_equal default_port
-        jq('.spec.ports[0].targetPort', resource('Service')).must_equal values[:service][:port][:targetPort]
+        jq('.spec.ports[0].targetPort', resource('Service')).must_equal values[:services][:main][:port][:targetPort]
         jq('.spec.ports[0].name', resource('Service')).must_equal default_name
-        jq('.spec.template.spec.containers[0].ports[0].containerPort', resource('Deployment')).must_equal values[:service][:port][:targetPort]
+        jq('.spec.template.spec.containers[0].ports[0].containerPort', resource('Deployment')).must_equal values[:services][:main][:port][:targetPort]
         jq('.spec.template.spec.containers[0].ports[0].name', resource('Deployment')).must_equal default_name
       end
 
       it 'targetPort cannot be a named port' do
         values = {
-          service: {
-            port: {
-              targetPort: 'test'
-            }
+          services: {
+		    main: {
+              port: {
+                targetPort: 'test'
+              }
+			}
           }
         }
         chart.value values
         exception = assert_raises HelmCompileError do
           chart.execute_helm_template!
         end
-        assert_match("Our charts do not support named ports for targetPort. (port name #{default_name}, targetPort #{values[:service][:port][:targetPort]})", exception.message)
+        assert_match("Our charts do not support named ports for targetPort. (port name #{default_name}, targetPort #{values[:services][:main][:port][:targetPort]})", exception.message)
       end
     end
 
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000000..48ddc30d7c9
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,42 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    m (1.5.1)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.2)
+    method_source (1.0.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
+    minitest-implicit-subject (1.4.0)
+      minitest
+    minitest-reporters (1.4.3)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    multi_json (1.15.0)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.3)
+    ruby-jq (0.2.1)
+      mini_portile2 (>= 2.2.0)
+      multi_json
+    ruby-progressbar (1.11.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  m
+  minitest
+  minitest-implicit-subject
+  minitest-reporters
+  pry
+  ruby-jq
+
+BUNDLED WITH
+   2.1.4
diff --git a/charts/bazarr/1.6.4/Chart.lock b/charts/bazarr/1.6.4/Chart.lock
deleted file mode 100644
index 8488950b278..00000000000
--- a/charts/bazarr/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:34:19.389372418Z"
diff --git a/charts/bazarr/1.6.4/charts/common-1.6.7.tgz b/charts/bazarr/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/bazarr/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/bazarr/1.6.4/.helmignore b/charts/bazarr/2.0.0/.helmignore
similarity index 100%
rename from charts/bazarr/1.6.4/.helmignore
rename to charts/bazarr/2.0.0/.helmignore
diff --git a/charts/bazarr/1.6.4/Chart.yaml b/charts/bazarr/2.0.0/Chart.yaml
similarity index 79%
rename from charts/bazarr/1.6.4/Chart.yaml
rename to charts/bazarr/2.0.0/Chart.yaml
index 3a74c0cefd5..7e338d3565e 100644
--- a/charts/bazarr/1.6.4/Chart.yaml
+++ b/charts/bazarr/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: bazarr
+<<<<<<< HEAD:charts/bazarr/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/Chart.yaml
 upstream_version: 5.2.1
 appVersion: v0.9.0.5
 description: Bazarr is a companion application to Bazarr and Radarr. It manages and downloads subtitles based on your requirements
@@ -24,7 +28,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/bazarr/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/bazarr/1.6.4/README.md b/charts/bazarr/2.0.0/README.md
similarity index 77%
rename from charts/bazarr/1.6.4/README.md
rename to charts/bazarr/2.0.0/README.md
index 9eae84c180b..e9d22b56be6 100644
--- a/charts/bazarr/1.6.4/README.md
+++ b/charts/bazarr/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/bazarr/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.0.5](https://img.shields.io/badge/AppVersion-v0.9.0.5-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.0.5](https://img.shields.io/badge/AppVersion-v0.9.0.5-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/README.md
 
 Bazarr is a companion application to Bazarr and Radarr. It manages and downloads subtitles based on your requirements
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/bazarr/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/bazarr/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/bazarr/1.6.4/app-readme.md b/charts/bazarr/2.0.0/app-readme.md
similarity index 99%
rename from charts/bazarr/1.6.4/app-readme.md
rename to charts/bazarr/2.0.0/app-readme.md
index 2e7cc147037..72b30ac1c20 100644
--- a/charts/bazarr/1.6.4/app-readme.md
+++ b/charts/bazarr/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Bazarr is a companion application to Bazarr and Radarr. It manages and downloads subtitles based on your requirements
-
diff --git a/charts/bazarr/2.0.0/charts/common-2.0.0.tgz b/charts/bazarr/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/bazarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/bazarr/1.6.4/docs/CONFIG.md b/charts/bazarr/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/bazarr/1.6.4/docs/CONFIG.md
rename to charts/bazarr/2.0.0/docs/CONFIG.md
diff --git a/.tools/templates/chart/docs/CONFIG.md.gotmpl b/charts/bazarr/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from .tools/templates/chart/docs/CONFIG.md.gotmpl
rename to charts/bazarr/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/bazarr/1.6.4/questions.yaml b/charts/bazarr/2.0.0/questions.yaml
similarity index 88%
rename from charts/bazarr/1.6.4/questions.yaml
rename to charts/bazarr/2.0.0/questions.yaml
index 538af27ee91..8f91feeeaf5 100644
--- a/charts/bazarr/1.6.4/questions.yaml
+++ b/charts/bazarr/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 6767
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 6767
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/.tools/templates/chart/templates/common.yaml b/charts/bazarr/2.0.0/templates/common.yaml
similarity index 100%
rename from .tools/templates/chart/templates/common.yaml
rename to charts/bazarr/2.0.0/templates/common.yaml
diff --git a/charts/bazarr/1.6.4/test_values.yaml b/charts/bazarr/2.0.0/test_values.yaml
similarity index 96%
rename from charts/bazarr/1.6.4/test_values.yaml
rename to charts/bazarr/2.0.0/test_values.yaml
index 851d649f3b0..bb43d2c8f57 100644
--- a/charts/bazarr/1.6.4/test_values.yaml
+++ b/charts/bazarr/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 6767
+services:
+  main:
+    port:
+      port: 6767
 
 env: {}
   # TZ: UTC
diff --git a/charts/bazarr/1.6.4/values.yaml b/charts/bazarr/2.0.0/values.yaml
similarity index 95%
rename from charts/bazarr/1.6.4/values.yaml
rename to charts/bazarr/2.0.0/values.yaml
index 270735412ed..25f823f5b50 100644
--- a/charts/bazarr/1.6.4/values.yaml
+++ b/charts/bazarr/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 6767
+services:
+  main:
+    port:
+      port: 6767
 
 env: {}
   # TZ: UTC
diff --git a/charts/calibre-web/1.6.4/Chart.lock b/charts/calibre-web/1.6.4/Chart.lock
deleted file mode 100644
index e03821ed3b6..00000000000
--- a/charts/calibre-web/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:34:16.711451938Z"
diff --git a/charts/calibre-web/1.6.4/charts/common-1.6.7.tgz b/charts/calibre-web/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/calibre-web/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/calibre-web/1.6.4/.helmignore b/charts/calibre-web/2.0.0/.helmignore
similarity index 100%
rename from charts/calibre-web/1.6.4/.helmignore
rename to charts/calibre-web/2.0.0/.helmignore
diff --git a/charts/calibre-web/1.6.4/Chart.yaml b/charts/calibre-web/2.0.0/Chart.yaml
similarity index 77%
rename from charts/calibre-web/1.6.4/Chart.yaml
rename to charts/calibre-web/2.0.0/Chart.yaml
index c17abfd442b..bca2d216ad9 100644
--- a/charts/calibre-web/1.6.4/Chart.yaml
+++ b/charts/calibre-web/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: calibre-web
+<<<<<<< HEAD:charts/calibre-web/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/Chart.yaml
 upstream_version: 4.3.1
 appVersion: 0.6.9
 description: Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/calibre-web/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/calibre-web/1.6.4/README.md b/charts/calibre-web/2.0.0/README.md
similarity index 77%
rename from charts/calibre-web/1.6.4/README.md
rename to charts/calibre-web/2.0.0/README.md
index bbd6a2d9d18..c36b29af887 100644
--- a/charts/calibre-web/1.6.4/README.md
+++ b/charts/calibre-web/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/calibre-web/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.9](https://img.shields.io/badge/AppVersion-0.6.9-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.9](https://img.shields.io/badge/AppVersion-0.6.9-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/README.md
 
 Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/calibre-web/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/calibre-web/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/calibre-web/1.6.4/app-readme.md b/charts/calibre-web/2.0.0/app-readme.md
similarity index 99%
rename from charts/calibre-web/1.6.4/app-readme.md
rename to charts/calibre-web/2.0.0/app-readme.md
index 9c3e1c28826..f623e40b732 100644
--- a/charts/calibre-web/1.6.4/app-readme.md
+++ b/charts/calibre-web/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
-
diff --git a/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz b/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/calibre-web/1.6.4/docs/CONFIG.md b/charts/calibre-web/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/calibre-web/1.6.4/docs/CONFIG.md
rename to charts/calibre-web/2.0.0/docs/CONFIG.md
diff --git a/charts/bazarr/1.6.4/docs/CONFIG.md.gotmpl b/charts/calibre-web/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/bazarr/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/calibre-web/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/calibre-web/1.6.4/questions.yaml b/charts/calibre-web/2.0.0/questions.yaml
similarity index 86%
rename from charts/calibre-web/1.6.4/questions.yaml
rename to charts/calibre-web/2.0.0/questions.yaml
index f6cbc058318..596e010fe6e 100644
--- a/charts/calibre-web/1.6.4/questions.yaml
+++ b/charts/calibre-web/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8083
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8083
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/.tools/templates/chart/templates/NOTES.txt b/charts/calibre-web/2.0.0/templates/NOTES.txt
similarity index 100%
rename from .tools/templates/chart/templates/NOTES.txt
rename to charts/calibre-web/2.0.0/templates/NOTES.txt
diff --git a/charts/bazarr/1.6.4/templates/common.yaml b/charts/calibre-web/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/bazarr/1.6.4/templates/common.yaml
rename to charts/calibre-web/2.0.0/templates/common.yaml
diff --git a/charts/calibre-web/1.6.4/test_values.yaml b/charts/calibre-web/2.0.0/test_values.yaml
similarity index 96%
rename from charts/calibre-web/1.6.4/test_values.yaml
rename to charts/calibre-web/2.0.0/test_values.yaml
index bf0ba994498..69dcbba78da 100644
--- a/charts/calibre-web/1.6.4/test_values.yaml
+++ b/charts/calibre-web/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8083
+services:
+  main:
+    port:
+      port: 8083
 
 env: {}
   # TZ:
diff --git a/charts/calibre-web/1.6.4/values.yaml b/charts/calibre-web/2.0.0/values.yaml
similarity index 95%
rename from charts/calibre-web/1.6.4/values.yaml
rename to charts/calibre-web/2.0.0/values.yaml
index 18d419b5594..06104fa9050 100644
--- a/charts/calibre-web/1.6.4/values.yaml
+++ b/charts/calibre-web/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8083
+services:
+  main:
+    port:
+      port: 8083
 
 env: {}
   # TZ:
diff --git a/charts/collabora-online/1.6.4/Chart.lock b/charts/collabora-online/1.6.4/Chart.lock
deleted file mode 100644
index ca5b8b6efec..00000000000
--- a/charts/collabora-online/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:34:13.976532921Z"
diff --git a/charts/collabora-online/1.6.4/charts/common-1.6.7.tgz b/charts/collabora-online/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/collabora-online/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/collabora-online/1.6.4/Chart.yaml b/charts/collabora-online/2.0.0/Chart.yaml
similarity index 76%
rename from charts/collabora-online/1.6.4/Chart.yaml
rename to charts/collabora-online/2.0.0/Chart.yaml
index f04233ab884..0a351570a49 100644
--- a/charts/collabora-online/1.6.4/Chart.yaml
+++ b/charts/collabora-online/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: collabora-online
+<<<<<<< HEAD:charts/collabora-online/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/Chart.yaml
 # upstream_version:
 appVersion: 6.4.6.1
 description: Collabora Online Development Edition – an awesome, Online Office suite image suitable for home use.
@@ -19,7 +23,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/collabora-online/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/collabora-online/1.6.4/README.md b/charts/collabora-online/2.0.0/README.md
similarity index 76%
rename from charts/collabora-online/1.6.4/README.md
rename to charts/collabora-online/2.0.0/README.md
index 4497c03d402..46f84f4a274 100644
--- a/charts/collabora-online/1.6.4/README.md
+++ b/charts/collabora-online/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/collabora-online/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.4.6.1](https://img.shields.io/badge/AppVersion-6.4.6.1-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.4.6.1](https://img.shields.io/badge/AppVersion-6.4.6.1-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/README.md
 
 Collabora Online Development Edition – an awesome, Online Office suite image suitable for home use.
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/collabora-online/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/collabora-online/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/collabora-online/1.6.4/app-readme.md b/charts/collabora-online/2.0.0/app-readme.md
similarity index 99%
rename from charts/collabora-online/1.6.4/app-readme.md
rename to charts/collabora-online/2.0.0/app-readme.md
index 39d843bbd59..f093e83c835 100644
--- a/charts/collabora-online/1.6.4/app-readme.md
+++ b/charts/collabora-online/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Collabora Online Development Edition – an awesome, Online Office suite image suitable for home use.
-
diff --git a/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz b/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/collabora-online/1.6.4/docs/CONFIG.md b/charts/collabora-online/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/collabora-online/1.6.4/docs/CONFIG.md
rename to charts/collabora-online/2.0.0/docs/CONFIG.md
diff --git a/charts/calibre-web/1.6.4/docs/CONFIG.md.gotmpl b/charts/collabora-online/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/calibre-web/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/collabora-online/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/collabora-online/1.6.4/questions.yaml b/charts/collabora-online/2.0.0/questions.yaml
similarity index 83%
rename from charts/collabora-online/1.6.4/questions.yaml
rename to charts/collabora-online/2.0.0/questions.yaml
index 554042a2acf..3b8c5a976ed 100644
--- a/charts/collabora-online/1.6.4/questions.yaml
+++ b/charts/collabora-online/2.0.0/questions.yaml
@@ -108,42 +108,73 @@ questions:
       default: "002"
 
   # Service Configuration
-  - variable: service
+  - variable: services
     group: "Networking"
-    label: "Configure Network"
+    label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 9980
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 9980
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 30980
+                        default: 36052
                         required: true
 
   # environmentVariables Configuraiton
diff --git a/charts/calibre-web/1.6.4/templates/NOTES.txt b/charts/collabora-online/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/calibre-web/1.6.4/templates/NOTES.txt
rename to charts/collabora-online/2.0.0/templates/NOTES.txt
diff --git a/charts/calibre-web/1.6.4/templates/common.yaml b/charts/collabora-online/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/calibre-web/1.6.4/templates/common.yaml
rename to charts/collabora-online/2.0.0/templates/common.yaml
diff --git a/charts/collabora-online/1.6.4/test_values.yaml b/charts/collabora-online/2.0.0/test_values.yaml
similarity index 100%
rename from charts/collabora-online/1.6.4/test_values.yaml
rename to charts/collabora-online/2.0.0/test_values.yaml
diff --git a/charts/collabora-online/1.6.4/values.yaml b/charts/collabora-online/2.0.0/values.yaml
similarity index 82%
rename from charts/collabora-online/1.6.4/values.yaml
rename to charts/collabora-online/2.0.0/values.yaml
index fa70ff74f2d..ea1980b4072 100644
--- a/charts/collabora-online/1.6.4/values.yaml
+++ b/charts/collabora-online/2.0.0/values.yaml
@@ -6,9 +6,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 9980
+services:
+  main:
+    port:
+      port: 9980
 
 env:
   domain:
diff --git a/charts/deluge/1.6.4/Chart.lock b/charts/deluge/1.6.4/Chart.lock
deleted file mode 100644
index 6702480414d..00000000000
--- a/charts/deluge/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:34:11.344240459Z"
diff --git a/charts/deluge/1.6.4/charts/common-1.6.7.tgz b/charts/deluge/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/deluge/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/deluge/1.6.4/.helmignore b/charts/deluge/2.0.0/.helmignore
similarity index 100%
rename from charts/deluge/1.6.4/.helmignore
rename to charts/deluge/2.0.0/.helmignore
diff --git a/charts/deluge/1.6.4/Chart.yaml b/charts/deluge/2.0.0/Chart.yaml
similarity index 75%
rename from charts/deluge/1.6.4/Chart.yaml
rename to charts/deluge/2.0.0/Chart.yaml
index 0c820eb9840..b2e521bff85 100644
--- a/charts/deluge/1.6.4/Chart.yaml
+++ b/charts/deluge/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: deluge
+<<<<<<< HEAD:charts/deluge/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/Chart.yaml
 upstream_version: 1.1.1
 appVersion: v2.0.3-2201906121747
 description: Deluge is a torrent download client
@@ -19,7 +23,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/deluge/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/deluge/1.6.4/README.md b/charts/deluge/2.0.0/README.md
similarity index 76%
rename from charts/deluge/1.6.4/README.md
rename to charts/deluge/2.0.0/README.md
index e94f74e13c3..e78af4e3d7d 100644
--- a/charts/deluge/1.6.4/README.md
+++ b/charts/deluge/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/deluge/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.3-2201906121747](https://img.shields.io/badge/AppVersion-v2.0.3--2201906121747-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.3-2201906121747](https://img.shields.io/badge/AppVersion-v2.0.3--2201906121747-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/README.md
 
 Deluge is a torrent download client
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/deluge/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/deluge/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/deluge/1.6.4/app-readme.md b/charts/deluge/2.0.0/app-readme.md
similarity index 97%
rename from charts/deluge/1.6.4/app-readme.md
rename to charts/deluge/2.0.0/app-readme.md
index 9e28afa58fe..37877646515 100644
--- a/charts/deluge/1.6.4/app-readme.md
+++ b/charts/deluge/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Deluge is a torrent download client
-
diff --git a/charts/deluge/2.0.0/charts/common-2.0.0.tgz b/charts/deluge/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/deluge/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/deluge/1.6.4/docs/CONFIG.md b/charts/deluge/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/deluge/1.6.4/docs/CONFIG.md
rename to charts/deluge/2.0.0/docs/CONFIG.md
diff --git a/charts/collabora-online/1.6.4/docs/CONFIG.md.gotmpl b/charts/deluge/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/collabora-online/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/deluge/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/deluge/1.6.4/questions.yaml b/charts/deluge/2.0.0/questions.yaml
similarity index 83%
rename from charts/deluge/1.6.4/questions.yaml
rename to charts/deluge/2.0.0/questions.yaml
index 88c51c1b02f..fd459603446 100644
--- a/charts/deluge/1.6.4/questions.yaml
+++ b/charts/deluge/2.0.0/questions.yaml
@@ -120,68 +120,94 @@ questions:
       type: boolean
       default: false
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8112
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8112
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
                         default: 36052
                         required: true
-
-  - variable: appAdditionalServices
-    group: "Networking"
-    label: "Configure additional services"
-    schema:
-      type: dict
-      attrs:
         - variable: tcp
-          label: ""
+          label: "TCP Torrent connections"
+          description: "This service is used to process incomming torrent connections over TCP"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable TCP port for Torrent Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -190,18 +216,17 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "torrent-tcp"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "TCP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -210,38 +235,41 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 51413
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 51413
-                        required: false
+                        default: 36052
+                        required: true
         - variable: udp
-          label: ""
+          label: "UDP Torrent connections"
+          description: "This service is used to process incomming torrent connections over UDP"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable UDP port for Torrent Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -250,18 +278,17 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "torrent-udp"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "UDP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -270,21 +297,21 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 51413
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 51413
-                        required: false
-
+                        default: 36052
+                        required: true
 
 ## TrueCharts Specific
 
diff --git a/charts/collabora-online/1.6.4/templates/NOTES.txt b/charts/deluge/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/collabora-online/1.6.4/templates/NOTES.txt
rename to charts/deluge/2.0.0/templates/NOTES.txt
diff --git a/charts/collabora-online/1.6.4/templates/common.yaml b/charts/deluge/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/collabora-online/1.6.4/templates/common.yaml
rename to charts/deluge/2.0.0/templates/common.yaml
diff --git a/charts/deluge/1.6.4/test_values.yaml b/charts/deluge/2.0.0/test_values.yaml
similarity index 91%
rename from charts/deluge/1.6.4/test_values.yaml
rename to charts/deluge/2.0.0/test_values.yaml
index a40fbb1064a..310b7f0d6b2 100644
--- a/charts/deluge/1.6.4/test_values.yaml
+++ b/charts/deluge/2.0.0/test_values.yaml
@@ -8,9 +8,24 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8112
+services:
+  main:
+    port:
+      port: 8112
+  tcp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51413
+      protocol: TCP
+      targetPort: 51413
+  udp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51413
+      protocol: UDP
+      targetPort: 51413
 
 persistence:
   config:
@@ -57,22 +72,3 @@ appVolumeMounts:
     emptyDir: true
     setPermissions: true
     mountPath: "/downloads"
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-tcp
-      protocol: TCP
-      targetPort: 51413
-  udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-udp
-      protocol: UDP
-      targetPort: 51413
diff --git a/charts/deluge/1.6.4/values.yaml b/charts/deluge/2.0.0/values.yaml
similarity index 77%
rename from charts/deluge/1.6.4/values.yaml
rename to charts/deluge/2.0.0/values.yaml
index 3043a75ebeb..136197cae0d 100644
--- a/charts/deluge/1.6.4/values.yaml
+++ b/charts/deluge/2.0.0/values.yaml
@@ -8,9 +8,24 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8112
+services:
+  main:
+    port:
+      port: 8112
+#  tcp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 51413
+#      protocol: TCP
+#      targetPort: 51413
+#  udp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 51413
+#      protocol: UDP
+#      targetPort: 51413
 
 persistence:
   config:
@@ -53,22 +68,3 @@ appIngressEnabled: false
 #   downloads:
 #     enabled: false
 #     emptyDir: false
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-tcp
-      protocol: TCP
-      targetPort: 51413
-  udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-udp
-      protocol: UDP
-      targetPort: 51413
diff --git a/charts/esphome/1.6.4/Chart.lock b/charts/esphome/1.6.4/Chart.lock
deleted file mode 100644
index 1bbec4a579c..00000000000
--- a/charts/esphome/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:34:08.67809444Z"
diff --git a/charts/esphome/1.6.4/charts/common-1.6.7.tgz b/charts/esphome/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/esphome/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/esphome/1.6.4/.helmignore b/charts/esphome/2.0.0/.helmignore
similarity index 100%
rename from charts/esphome/1.6.4/.helmignore
rename to charts/esphome/2.0.0/.helmignore
diff --git a/charts/esphome/1.6.4/Chart.yaml b/charts/esphome/2.0.0/Chart.yaml
similarity index 78%
rename from charts/esphome/1.6.4/Chart.yaml
rename to charts/esphome/2.0.0/Chart.yaml
index 19580dddf72..18d402168dc 100644
--- a/charts/esphome/1.6.4/Chart.yaml
+++ b/charts/esphome/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: esphome
+<<<<<<< HEAD:charts/esphome/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/esphome/2.0.0/Chart.yaml
 upstream_version: 4.3.1
 appVersion: 1.15.3
 description: ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configuration files and control them remotely through Home Automation systems.
@@ -19,7 +23,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/esphome/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/esphome/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/esphome/1.6.4/README.md b/charts/esphome/2.0.0/README.md
similarity index 77%
rename from charts/esphome/1.6.4/README.md
rename to charts/esphome/2.0.0/README.md
index 59a2f04382e..d0497930cee 100644
--- a/charts/esphome/1.6.4/README.md
+++ b/charts/esphome/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/esphome/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.15.3](https://img.shields.io/badge/AppVersion-1.15.3-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.15.3](https://img.shields.io/badge/AppVersion-1.15.3-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/esphome/2.0.0/README.md
 
 ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configuration files and control them remotely through Home Automation systems.
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/esphome/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/esphome/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/esphome/1.6.4/app-readme.md b/charts/esphome/2.0.0/app-readme.md
similarity index 99%
rename from charts/esphome/1.6.4/app-readme.md
rename to charts/esphome/2.0.0/app-readme.md
index 19676c01b9c..aef2e1b409e 100644
--- a/charts/esphome/1.6.4/app-readme.md
+++ b/charts/esphome/2.0.0/app-readme.md
@@ -1,2 +1 @@
 ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configuration files and control them remotely through Home Automation systems.
-
diff --git a/charts/esphome/2.0.0/charts/common-2.0.0.tgz b/charts/esphome/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/esphome/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/esphome/1.6.4/docs/CONFIG.md b/charts/esphome/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/esphome/1.6.4/docs/CONFIG.md
rename to charts/esphome/2.0.0/docs/CONFIG.md
diff --git a/charts/deluge/1.6.4/docs/CONFIG.md.gotmpl b/charts/esphome/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/deluge/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/esphome/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/esphome/1.6.4/questions.yaml b/charts/esphome/2.0.0/questions.yaml
similarity index 85%
rename from charts/esphome/1.6.4/questions.yaml
rename to charts/esphome/2.0.0/questions.yaml
index aca0c5f6080..e23dc729048 100644
--- a/charts/esphome/1.6.4/questions.yaml
+++ b/charts/esphome/2.0.0/questions.yaml
@@ -128,38 +128,70 @@ questions:
     schema:
       type: boolean
       default: false
+
   # Service Configuration
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "NodePort"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 6052
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 6052
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/deluge/1.6.4/templates/common.yaml b/charts/esphome/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/deluge/1.6.4/templates/common.yaml
rename to charts/esphome/2.0.0/templates/common.yaml
diff --git a/charts/esphome/1.6.4/test_values.yaml b/charts/esphome/2.0.0/test_values.yaml
similarity index 95%
rename from charts/esphome/1.6.4/test_values.yaml
rename to charts/esphome/2.0.0/test_values.yaml
index 9dd3b57bc02..98e0c256102 100644
--- a/charts/esphome/1.6.4/test_values.yaml
+++ b/charts/esphome/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 6052
+services:
+  main:
+    port:
+      port: 6052
     nodePort: 30052
 
 env: {}
diff --git a/charts/esphome/1.6.4/values.yaml b/charts/esphome/2.0.0/values.yaml
similarity index 100%
rename from charts/esphome/1.6.4/values.yaml
rename to charts/esphome/2.0.0/values.yaml
diff --git a/charts/freshrss/1.6.4/Chart.lock b/charts/freshrss/1.6.4/Chart.lock
deleted file mode 100644
index 4f765543bdb..00000000000
--- a/charts/freshrss/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:34:06.041568677Z"
diff --git a/charts/freshrss/1.6.4/charts/common-1.6.7.tgz b/charts/freshrss/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/freshrss/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/freshrss/1.6.4/.helmignore b/charts/freshrss/2.0.0/.helmignore
similarity index 100%
rename from charts/freshrss/1.6.4/.helmignore
rename to charts/freshrss/2.0.0/.helmignore
diff --git a/charts/freshrss/1.6.4/Chart.yaml b/charts/freshrss/2.0.0/Chart.yaml
similarity index 75%
rename from charts/freshrss/1.6.4/Chart.yaml
rename to charts/freshrss/2.0.0/Chart.yaml
index 685bd3164ce..b013128e8ff 100644
--- a/charts/freshrss/1.6.4/Chart.yaml
+++ b/charts/freshrss/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: freshrss
+<<<<<<< HEAD:charts/freshrss/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/freshrss/2.0.0/Chart.yaml
 upstream_version: 2.3.1
 appVersion: 1.17.0
 description: FreshRSS is a self-hosted RSS feed aggregator
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/freshrss/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/freshrss/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/freshrss/1.6.4/README.md b/charts/freshrss/2.0.0/README.md
similarity index 77%
rename from charts/freshrss/1.6.4/README.md
rename to charts/freshrss/2.0.0/README.md
index a01de8d5267..d91ccc8e2cb 100644
--- a/charts/freshrss/1.6.4/README.md
+++ b/charts/freshrss/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/freshrss/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.17.0](https://img.shields.io/badge/AppVersion-1.17.0-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.17.0](https://img.shields.io/badge/AppVersion-1.17.0-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/freshrss/2.0.0/README.md
 
 FreshRSS is a self-hosted RSS feed aggregator
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/freshrss/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/freshrss/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/freshrss/1.6.4/app-readme.md b/charts/freshrss/2.0.0/app-readme.md
similarity index 97%
rename from charts/freshrss/1.6.4/app-readme.md
rename to charts/freshrss/2.0.0/app-readme.md
index 9bf40004b53..bf72123e2f4 100644
--- a/charts/freshrss/1.6.4/app-readme.md
+++ b/charts/freshrss/2.0.0/app-readme.md
@@ -1,2 +1 @@
 FreshRSS is a self-hosted RSS feed aggregator
-
diff --git a/charts/freshrss/2.0.0/charts/common-2.0.0.tgz b/charts/freshrss/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/freshrss/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/freshrss/1.6.4/docs/CONFIG.md b/charts/freshrss/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/freshrss/1.6.4/docs/CONFIG.md
rename to charts/freshrss/2.0.0/docs/CONFIG.md
diff --git a/charts/esphome/1.6.4/docs/CONFIG.md.gotmpl b/charts/freshrss/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/esphome/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/freshrss/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/freshrss/1.6.4/questions.yaml b/charts/freshrss/2.0.0/questions.yaml
similarity index 84%
rename from charts/freshrss/1.6.4/questions.yaml
rename to charts/freshrss/2.0.0/questions.yaml
index c6a5d97923d..af45125c3ad 100644
--- a/charts/freshrss/1.6.4/questions.yaml
+++ b/charts/freshrss/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 80
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/deluge/1.6.4/templates/NOTES.txt b/charts/freshrss/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/deluge/1.6.4/templates/NOTES.txt
rename to charts/freshrss/2.0.0/templates/NOTES.txt
diff --git a/charts/esphome/1.6.4/templates/common.yaml b/charts/freshrss/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/esphome/1.6.4/templates/common.yaml
rename to charts/freshrss/2.0.0/templates/common.yaml
diff --git a/charts/freshrss/1.6.4/test_values.yaml b/charts/freshrss/2.0.0/test_values.yaml
similarity index 90%
rename from charts/freshrss/1.6.4/test_values.yaml
rename to charts/freshrss/2.0.0/test_values.yaml
index be7e8af2682..1f2e52c5321 100644
--- a/charts/freshrss/1.6.4/test_values.yaml
+++ b/charts/freshrss/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ: UTC
diff --git a/charts/freshrss/1.6.4/values.yaml b/charts/freshrss/2.0.0/values.yaml
similarity index 89%
rename from charts/freshrss/1.6.4/values.yaml
rename to charts/freshrss/2.0.0/values.yaml
index bd967409bb0..4758d8f97b4 100644
--- a/charts/freshrss/1.6.4/values.yaml
+++ b/charts/freshrss/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ: UTC
diff --git a/charts/gaps/1.6.4/Chart.lock b/charts/gaps/1.6.4/Chart.lock
deleted file mode 100644
index 409663e3f8e..00000000000
--- a/charts/gaps/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:34:03.366726837Z"
diff --git a/charts/gaps/1.6.4/charts/common-1.6.7.tgz b/charts/gaps/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/gaps/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/gaps/1.6.4/.helmignore b/charts/gaps/2.0.0/.helmignore
similarity index 100%
rename from charts/gaps/1.6.4/.helmignore
rename to charts/gaps/2.0.0/.helmignore
diff --git a/charts/gaps/1.6.4/Chart.yaml b/charts/gaps/2.0.0/Chart.yaml
similarity index 77%
rename from charts/gaps/1.6.4/Chart.yaml
rename to charts/gaps/2.0.0/Chart.yaml
index 4af7798f461..b8260f6141d 100644
--- a/charts/gaps/1.6.4/Chart.yaml
+++ b/charts/gaps/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: gaps
+<<<<<<< HEAD:charts/gaps/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/gaps/2.0.0/Chart.yaml
 upstream_version: 1.1.1
 appVersion: latest
 description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection.
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/gaps/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/gaps/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/gaps/1.6.4/README.md b/charts/gaps/2.0.0/README.md
similarity index 77%
rename from charts/gaps/1.6.4/README.md
rename to charts/gaps/2.0.0/README.md
index c5f6a370d0f..94c6faf31fd 100644
--- a/charts/gaps/1.6.4/README.md
+++ b/charts/gaps/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/gaps/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/gaps/2.0.0/README.md
 
 Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection.
 
@@ -21,7 +25,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/gaps/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/gaps/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/gaps/1.6.4/app-readme.md b/charts/gaps/2.0.0/app-readme.md
similarity index 99%
rename from charts/gaps/1.6.4/app-readme.md
rename to charts/gaps/2.0.0/app-readme.md
index 0c89f3767e8..3f24e445a18 100644
--- a/charts/gaps/1.6.4/app-readme.md
+++ b/charts/gaps/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection.
-
diff --git a/charts/gaps/2.0.0/charts/common-2.0.0.tgz b/charts/gaps/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/gaps/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/gaps/1.6.4/docs/CONFIG.md b/charts/gaps/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/gaps/1.6.4/docs/CONFIG.md
rename to charts/gaps/2.0.0/docs/CONFIG.md
diff --git a/charts/freshrss/1.6.4/docs/CONFIG.md.gotmpl b/charts/gaps/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/freshrss/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/gaps/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/gaps/1.6.4/questions.yaml b/charts/gaps/2.0.0/questions.yaml
similarity index 84%
rename from charts/gaps/1.6.4/questions.yaml
rename to charts/gaps/2.0.0/questions.yaml
index 461bc79b258..0c0d05a4bb2 100644
--- a/charts/gaps/1.6.4/questions.yaml
+++ b/charts/gaps/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8484
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8484
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/freshrss/1.6.4/templates/NOTES.txt b/charts/gaps/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/freshrss/1.6.4/templates/NOTES.txt
rename to charts/gaps/2.0.0/templates/NOTES.txt
diff --git a/charts/freshrss/1.6.4/templates/common.yaml b/charts/gaps/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/freshrss/1.6.4/templates/common.yaml
rename to charts/gaps/2.0.0/templates/common.yaml
diff --git a/charts/gaps/1.6.4/test_values.yaml b/charts/gaps/2.0.0/test_values.yaml
similarity index 89%
rename from charts/gaps/1.6.4/test_values.yaml
rename to charts/gaps/2.0.0/test_values.yaml
index 9db31f2b553..ab13d19f8e4 100644
--- a/charts/gaps/1.6.4/test_values.yaml
+++ b/charts/gaps/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8484
+services:
+  main:
+    port:
+      port: 8484
 
 env: {}
   # TZ: UTC
diff --git a/charts/gaps/1.6.4/values.yaml b/charts/gaps/2.0.0/values.yaml
similarity index 85%
rename from charts/gaps/1.6.4/values.yaml
rename to charts/gaps/2.0.0/values.yaml
index 2c75ebcdc64..d3dea753918 100644
--- a/charts/gaps/1.6.4/values.yaml
+++ b/charts/gaps/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8484
+services:
+  main:
+    port:
+      port: 8484
 
 env: {}
   # TZ: UTC
diff --git a/charts/grocy/1.6.4/Chart.lock b/charts/grocy/1.6.4/Chart.lock
deleted file mode 100644
index 9a4e4b7fec3..00000000000
--- a/charts/grocy/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:34:00.556284629Z"
diff --git a/charts/grocy/1.6.4/charts/common-1.6.7.tgz b/charts/grocy/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/grocy/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/grocy/1.6.4/.helmignore b/charts/grocy/2.0.0/.helmignore
similarity index 100%
rename from charts/grocy/1.6.4/.helmignore
rename to charts/grocy/2.0.0/.helmignore
diff --git a/charts/grocy/1.6.4/Chart.yaml b/charts/grocy/2.0.0/Chart.yaml
similarity index 76%
rename from charts/grocy/1.6.4/Chart.yaml
rename to charts/grocy/2.0.0/Chart.yaml
index 200af2216a9..61e848a07eb 100644
--- a/charts/grocy/1.6.4/Chart.yaml
+++ b/charts/grocy/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: grocy
+<<<<<<< HEAD:charts/grocy/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/grocy/2.0.0/Chart.yaml
 upstream_version: 4.3.1
 appVersion: v2.7.1
 description: ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home
@@ -18,7 +22,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/grocy/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/grocy/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/grocy/1.6.4/README.md b/charts/grocy/2.0.0/README.md
similarity index 77%
rename from charts/grocy/1.6.4/README.md
rename to charts/grocy/2.0.0/README.md
index 199f81896a2..239de036e89 100644
--- a/charts/grocy/1.6.4/README.md
+++ b/charts/grocy/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/grocy/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.7.1](https://img.shields.io/badge/AppVersion-v2.7.1-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.7.1](https://img.shields.io/badge/AppVersion-v2.7.1-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/grocy/2.0.0/README.md
 
 ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home
 
@@ -21,7 +25,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/grocy/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/grocy/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/grocy/1.6.4/app-readme.md b/charts/grocy/2.0.0/app-readme.md
similarity index 99%
rename from charts/grocy/1.6.4/app-readme.md
rename to charts/grocy/2.0.0/app-readme.md
index 39247b6d51b..c510fea28b5 100644
--- a/charts/grocy/1.6.4/app-readme.md
+++ b/charts/grocy/2.0.0/app-readme.md
@@ -1,2 +1 @@
 ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home
-
diff --git a/charts/grocy/2.0.0/charts/common-2.0.0.tgz b/charts/grocy/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/grocy/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/grocy/1.6.4/docs/CONFIG.md b/charts/grocy/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/grocy/1.6.4/docs/CONFIG.md
rename to charts/grocy/2.0.0/docs/CONFIG.md
diff --git a/charts/gaps/1.6.4/docs/CONFIG.md.gotmpl b/charts/grocy/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/gaps/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/grocy/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/grocy/1.6.4/questions.yaml b/charts/grocy/2.0.0/questions.yaml
similarity index 84%
rename from charts/grocy/1.6.4/questions.yaml
rename to charts/grocy/2.0.0/questions.yaml
index ca7a7d3c4ff..8c689b677fd 100644
--- a/charts/grocy/1.6.4/questions.yaml
+++ b/charts/grocy/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 80
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/gaps/1.6.4/templates/common.yaml b/charts/grocy/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/gaps/1.6.4/templates/common.yaml
rename to charts/grocy/2.0.0/templates/common.yaml
diff --git a/charts/grocy/1.6.4/test_values.yaml b/charts/grocy/2.0.0/test_values.yaml
similarity index 90%
rename from charts/grocy/1.6.4/test_values.yaml
rename to charts/grocy/2.0.0/test_values.yaml
index ee7f8128a30..99b4635309f 100644
--- a/charts/grocy/1.6.4/test_values.yaml
+++ b/charts/grocy/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ:
diff --git a/charts/grocy/1.6.4/values.yaml b/charts/grocy/2.0.0/values.yaml
similarity index 86%
rename from charts/grocy/1.6.4/values.yaml
rename to charts/grocy/2.0.0/values.yaml
index 086a7ad17fd..26c3ac9b3db 100644
--- a/charts/grocy/1.6.4/values.yaml
+++ b/charts/grocy/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ:
diff --git a/charts/handbrake/1.3.4/Chart.lock b/charts/handbrake/1.3.4/Chart.lock
deleted file mode 100644
index e32f48fdba5..00000000000
--- a/charts/handbrake/1.3.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:57.828992522Z"
diff --git a/charts/handbrake/1.3.4/charts/common-1.6.7.tgz b/charts/handbrake/1.3.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/handbrake/1.3.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/handbrake/1.3.4/Chart.yaml b/charts/handbrake/2.0.0/Chart.yaml
similarity index 76%
rename from charts/handbrake/1.3.4/Chart.yaml
rename to charts/handbrake/2.0.0/Chart.yaml
index c87b17ef7bc..d798089a730 100644
--- a/charts/handbrake/1.3.4/Chart.yaml
+++ b/charts/handbrake/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: handbrake
+<<<<<<< HEAD:charts/handbrake/1.3.4/Chart.yaml
 version: 1.3.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/handbrake/2.0.0/Chart.yaml
 # upstream_version:
 appVersion: 1.23.1
 description: HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/handbrake/1.3.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/handbrake/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/handbrake/1.3.4/README.md b/charts/handbrake/2.0.0/README.md
similarity index 77%
rename from charts/handbrake/1.3.4/README.md
rename to charts/handbrake/2.0.0/README.md
index 31442bbff08..2dca59b5eef 100644
--- a/charts/handbrake/1.3.4/README.md
+++ b/charts/handbrake/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/handbrake/1.3.4/README.md
 ![Version: 1.3.4](https://img.shields.io/badge/Version-1.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.23.1](https://img.shields.io/badge/AppVersion-1.23.1-informational?style=flat-square)
+=======
+![Version: 1.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.23.1](https://img.shields.io/badge/AppVersion-1.23.1-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/handbrake/2.0.0/README.md
 
 HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/handbrake/1.3.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/handbrake/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/handbrake/1.3.4/app-readme.md b/charts/handbrake/2.0.0/app-readme.md
similarity index 99%
rename from charts/handbrake/1.3.4/app-readme.md
rename to charts/handbrake/2.0.0/app-readme.md
index 710382158fa..8b5152ae500 100644
--- a/charts/handbrake/1.3.4/app-readme.md
+++ b/charts/handbrake/2.0.0/app-readme.md
@@ -1,2 +1 @@
 HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.
-
diff --git a/charts/handbrake/2.0.0/charts/common-2.0.0.tgz b/charts/handbrake/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/handbrake/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/handbrake/1.3.4/docs/CONFIG.md b/charts/handbrake/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/handbrake/1.3.4/docs/CONFIG.md
rename to charts/handbrake/2.0.0/docs/CONFIG.md
diff --git a/charts/grocy/1.6.4/docs/CONFIG.md.gotmpl b/charts/handbrake/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/grocy/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/handbrake/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/handbrake/1.3.4/questions.yaml b/charts/handbrake/2.0.0/questions.yaml
similarity index 88%
rename from charts/handbrake/1.3.4/questions.yaml
rename to charts/handbrake/2.0.0/questions.yaml
index 24366eb1078..ed0578d769d 100644
--- a/charts/handbrake/1.3.4/questions.yaml
+++ b/charts/handbrake/2.0.0/questions.yaml
@@ -199,67 +199,32 @@ questions:
                   required: true
 
 # Networking
-  - variable: service
-    group: "Services"
+  - variable: services
+    group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
-          schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
-              - variable: port
-                label: "Port configuration"
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: webuiport
-                      label: "container port"
-                      schema:
-                        type: int
-                        default: 5800     #web GUI
-                        editable: false
-                    - variable: nodePort
-                      label: "Node Port to expose for UI"
-                      schema:
-                        type: int
-                        min: 9000
-                        max: 65535
-                        default: 36052
-                        required: true
-  - variable: appAdditionalServices
-    group: "Services"
-    label: "Configure additional services"
-    schema:
-      type: dict
-      attrs:
-        - variable: tcp
-          label: ""
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable TCP port for vnc Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -268,18 +233,79 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "vnc-tcp"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "TCP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
+                    - variable: port
+                      label: "container port"
+                      schema:
+                        type: int
+                        default: 5800
+                        editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 5800
+                        editable: true
+                    - variable: nodePort
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
+                      schema:
+                        type: int
+                        min: 9000
+                        max: 65535
+                        default: 36052
+                        required: true
+        - variable: vnc
+          label: "VNC service"
+          description: "Service to connect to VNC if enabled"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+              - variable: port
+                label: "Port configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -288,20 +314,22 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 5900
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 36053
-                        required: false
+                        default: 36052
+                        required: true
+
     # Host Networking
   - variable: hostNetwork
     group: "Networking"
diff --git a/charts/gaps/1.6.4/templates/NOTES.txt b/charts/handbrake/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/gaps/1.6.4/templates/NOTES.txt
rename to charts/handbrake/2.0.0/templates/NOTES.txt
diff --git a/charts/grocy/1.6.4/templates/common.yaml b/charts/handbrake/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/grocy/1.6.4/templates/common.yaml
rename to charts/handbrake/2.0.0/templates/common.yaml
diff --git a/charts/handbrake/1.3.4/test_values.yaml b/charts/handbrake/2.0.0/test_values.yaml
similarity index 95%
rename from charts/handbrake/1.3.4/test_values.yaml
rename to charts/handbrake/2.0.0/test_values.yaml
index 436850cf1a9..e905a5a849b 100644
--- a/charts/handbrake/1.3.4/test_values.yaml
+++ b/charts/handbrake/2.0.0/test_values.yaml
@@ -6,9 +6,17 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 5800            #Required for web GUI
+services:
+  main:
+    port:
+      port: 5800            #Required for web GUI
+  vnc:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 5900
+      protocol: "TCP"
+      targetPort: 5900
 
 #All values here are set as the docker defaults.
 envTpl:
@@ -114,14 +122,3 @@ appVolumeMounts:
 #    hostPath: "/dev/sr0"
 #    hostPathEnabled: true
 #    setPermissions: true
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  vnc:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 5900
-      name: vnc
-      protocol: "TCP"
-      targetPort: 5900
diff --git a/charts/handbrake/1.3.4/values.yaml b/charts/handbrake/2.0.0/values.yaml
similarity index 91%
rename from charts/handbrake/1.3.4/values.yaml
rename to charts/handbrake/2.0.0/values.yaml
index 97136da27be..cb7811e2f4d 100644
--- a/charts/handbrake/1.3.4/values.yaml
+++ b/charts/handbrake/2.0.0/values.yaml
@@ -6,9 +6,17 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 5800            #Required for web GUI
+services:
+  main:
+    port:
+      port: 5800            #Required for web GUI
+#  vnc:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 5900
+#      protocol: "TCP"
+#      targetPort: 5900
 
 #All values here are set as the docker defaults.
 envTpl:
@@ -114,15 +122,3 @@ additionalVolumes: []
 #    hostPath: "/dev/sr0"
 #    hostPathEnabled: true
 #    setPermissions: true
-
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  vnc:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 5900
-      name: vnc
-      protocol: "TCP"
-      targetPort: 5900
diff --git a/charts/heimdall/1.6.4/Chart.lock b/charts/heimdall/1.6.4/Chart.lock
deleted file mode 100644
index a05b71f2c91..00000000000
--- a/charts/heimdall/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:55.131477619Z"
diff --git a/charts/heimdall/1.6.4/charts/common-1.6.7.tgz b/charts/heimdall/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/heimdall/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/heimdall/1.6.4/.helmignore b/charts/heimdall/2.0.0/.helmignore
similarity index 100%
rename from charts/heimdall/1.6.4/.helmignore
rename to charts/heimdall/2.0.0/.helmignore
diff --git a/charts/heimdall/1.6.4/Chart.yaml b/charts/heimdall/2.0.0/Chart.yaml
similarity index 71%
rename from charts/heimdall/1.6.4/Chart.yaml
rename to charts/heimdall/2.0.0/Chart.yaml
index 5271138e682..b8bc6f40eca 100644
--- a/charts/heimdall/1.6.4/Chart.yaml
+++ b/charts/heimdall/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: heimdall
+<<<<<<< HEAD:charts/heimdall/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/heimdall/2.0.0/Chart.yaml
 upstream_version: 4.1.1
 appVersion: 2.2.2
 description: An Application dashboard and launcher
@@ -17,7 +21,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/heimdall/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/heimdall/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/heimdall/1.6.4/README.md b/charts/heimdall/2.0.0/README.md
similarity index 76%
rename from charts/heimdall/1.6.4/README.md
rename to charts/heimdall/2.0.0/README.md
index 4da442bcc8f..68e4862f6db 100644
--- a/charts/heimdall/1.6.4/README.md
+++ b/charts/heimdall/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/heimdall/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.2](https://img.shields.io/badge/AppVersion-2.2.2-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.2](https://img.shields.io/badge/AppVersion-2.2.2-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/heimdall/2.0.0/README.md
 
 An Application dashboard and launcher
 
@@ -20,7 +24,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/heimdall/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/heimdall/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/heimdall/1.6.4/app-readme.md b/charts/heimdall/2.0.0/app-readme.md
similarity index 97%
rename from charts/heimdall/1.6.4/app-readme.md
rename to charts/heimdall/2.0.0/app-readme.md
index 3cd418b44b6..38058a79876 100644
--- a/charts/heimdall/1.6.4/app-readme.md
+++ b/charts/heimdall/2.0.0/app-readme.md
@@ -1,2 +1 @@
 An Application dashboard and launcher
-
diff --git a/charts/heimdall/2.0.0/charts/common-2.0.0.tgz b/charts/heimdall/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/heimdall/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/heimdall/1.6.4/docs/CONFIG.md b/charts/heimdall/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/heimdall/1.6.4/docs/CONFIG.md
rename to charts/heimdall/2.0.0/docs/CONFIG.md
diff --git a/charts/handbrake/1.3.4/docs/CONFIG.md.gotmpl b/charts/heimdall/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/handbrake/1.3.4/docs/CONFIG.md.gotmpl
rename to charts/heimdall/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/heimdall/1.6.4/questions.yaml b/charts/heimdall/2.0.0/questions.yaml
similarity index 84%
rename from charts/heimdall/1.6.4/questions.yaml
rename to charts/heimdall/2.0.0/questions.yaml
index 042c31e5478..a87232f1c5d 100644
--- a/charts/heimdall/1.6.4/questions.yaml
+++ b/charts/heimdall/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 80
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/handbrake/1.3.4/templates/common.yaml b/charts/heimdall/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/handbrake/1.3.4/templates/common.yaml
rename to charts/heimdall/2.0.0/templates/common.yaml
diff --git a/charts/heimdall/1.6.4/test_values.yaml b/charts/heimdall/2.0.0/test_values.yaml
similarity index 90%
rename from charts/heimdall/1.6.4/test_values.yaml
rename to charts/heimdall/2.0.0/test_values.yaml
index 23cb71bec5f..a1ce3aa4ef0 100644
--- a/charts/heimdall/1.6.4/test_values.yaml
+++ b/charts/heimdall/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ:
diff --git a/charts/heimdall/1.6.4/values.yaml b/charts/heimdall/2.0.0/values.yaml
similarity index 90%
rename from charts/heimdall/1.6.4/values.yaml
rename to charts/heimdall/2.0.0/values.yaml
index faf868b8f69..9d5953bbda1 100644
--- a/charts/heimdall/1.6.4/values.yaml
+++ b/charts/heimdall/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ:
diff --git a/charts/home-assistant/1.6.4/Chart.lock b/charts/home-assistant/1.6.4/Chart.lock
deleted file mode 100644
index bfab6ca455a..00000000000
--- a/charts/home-assistant/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:52.433886727Z"
diff --git a/charts/home-assistant/1.6.4/charts/common-1.6.7.tgz b/charts/home-assistant/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/home-assistant/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/home-assistant/1.6.4/.helmignore b/charts/home-assistant/2.0.0/.helmignore
similarity index 100%
rename from charts/home-assistant/1.6.4/.helmignore
rename to charts/home-assistant/2.0.0/.helmignore
diff --git a/charts/home-assistant/1.6.4/Chart.yaml b/charts/home-assistant/2.0.0/Chart.yaml
similarity index 84%
rename from charts/home-assistant/1.6.4/Chart.yaml
rename to charts/home-assistant/2.0.0/Chart.yaml
index 7836b328600..31d986aaad5 100644
--- a/charts/home-assistant/1.6.4/Chart.yaml
+++ b/charts/home-assistant/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: home-assistant
+<<<<<<< HEAD:charts/home-assistant/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/home-assistant/2.0.0/Chart.yaml
 upstream_version: 5.3.0
 appVersion: 2021.2.2
 description: home-assistant App for TrueNAS SCALE
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/home-assistant/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/home-assistant/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/home-assistant/1.6.4/README.md b/charts/home-assistant/2.0.0/README.md
similarity index 76%
rename from charts/home-assistant/1.6.4/README.md
rename to charts/home-assistant/2.0.0/README.md
index 3dc06b643a5..c15a6498186 100644
--- a/charts/home-assistant/1.6.4/README.md
+++ b/charts/home-assistant/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/home-assistant/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2021.2.2](https://img.shields.io/badge/AppVersion-2021.2.2-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2021.2.2](https://img.shields.io/badge/AppVersion-2021.2.2-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/home-assistant/2.0.0/README.md
 
 home-assistant App for TrueNAS SCALE
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/home-assistant/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/home-assistant/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/home-assistant/1.6.4/app-readme.md b/charts/home-assistant/2.0.0/app-readme.md
similarity index 97%
rename from charts/home-assistant/1.6.4/app-readme.md
rename to charts/home-assistant/2.0.0/app-readme.md
index 880ead21fc4..15cfb6b1086 100644
--- a/charts/home-assistant/1.6.4/app-readme.md
+++ b/charts/home-assistant/2.0.0/app-readme.md
@@ -1,2 +1 @@
 home-assistant App for TrueNAS SCALE
-
diff --git a/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz b/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/home-assistant/1.6.4/docs/CONFIG.md b/charts/home-assistant/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/home-assistant/1.6.4/docs/CONFIG.md
rename to charts/home-assistant/2.0.0/docs/CONFIG.md
diff --git a/charts/heimdall/1.6.4/docs/CONFIG.md.gotmpl b/charts/home-assistant/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/heimdall/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/home-assistant/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/home-assistant/1.6.4/questions.yaml b/charts/home-assistant/2.0.0/questions.yaml
similarity index 88%
rename from charts/home-assistant/1.6.4/questions.yaml
rename to charts/home-assistant/2.0.0/questions.yaml
index 8568cca53c0..2d34cfdfb54 100644
--- a/charts/home-assistant/1.6.4/questions.yaml
+++ b/charts/home-assistant/2.0.0/questions.yaml
@@ -297,42 +297,73 @@ questions:
 
 
   # Service Configuration
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "NodePort"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8123
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8123
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 38123
+                        default: 36052
                         required: true
 
   - variable: appIngress
diff --git a/charts/heimdall/1.6.4/templates/common.yaml b/charts/home-assistant/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/heimdall/1.6.4/templates/common.yaml
rename to charts/home-assistant/2.0.0/templates/common.yaml
diff --git a/charts/home-assistant/1.6.4/templates/secret.yaml b/charts/home-assistant/2.0.0/templates/secret.yaml
similarity index 100%
rename from charts/home-assistant/1.6.4/templates/secret.yaml
rename to charts/home-assistant/2.0.0/templates/secret.yaml
diff --git a/charts/home-assistant/1.6.4/templates/servicemonitor.yaml b/charts/home-assistant/2.0.0/templates/servicemonitor.yaml
similarity index 100%
rename from charts/home-assistant/1.6.4/templates/servicemonitor.yaml
rename to charts/home-assistant/2.0.0/templates/servicemonitor.yaml
diff --git a/charts/home-assistant/1.6.4/test_values.yaml b/charts/home-assistant/2.0.0/test_values.yaml
similarity index 98%
rename from charts/home-assistant/1.6.4/test_values.yaml
rename to charts/home-assistant/2.0.0/test_values.yaml
index 936cad06a36..468d2fbb3be 100644
--- a/charts/home-assistant/1.6.4/test_values.yaml
+++ b/charts/home-assistant/2.0.0/test_values.yaml
@@ -11,9 +11,10 @@ strategy:
 env: {}
   # TZ:
 
-service:
-  port:
-    port: 8123
+services:
+  main:
+    port:
+      port: 8123
     nodePort: 30023
 
 # # Enable devices to be discoverable
diff --git a/charts/home-assistant/1.6.4/values.yaml b/charts/home-assistant/2.0.0/values.yaml
similarity index 100%
rename from charts/home-assistant/1.6.4/values.yaml
rename to charts/home-assistant/2.0.0/values.yaml
diff --git a/charts/jackett/1.6.4/Chart.lock b/charts/jackett/1.6.4/Chart.lock
deleted file mode 100644
index 3cc7eeff84a..00000000000
--- a/charts/jackett/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:49.78355361Z"
diff --git a/charts/jackett/1.6.4/charts/common-1.6.7.tgz b/charts/jackett/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/jackett/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/jackett/1.6.4/.helmignore b/charts/jackett/2.0.0/.helmignore
similarity index 100%
rename from charts/jackett/1.6.4/.helmignore
rename to charts/jackett/2.0.0/.helmignore
diff --git a/charts/jackett/1.6.4/Chart.yaml b/charts/jackett/2.0.0/Chart.yaml
similarity index 78%
rename from charts/jackett/1.6.4/Chart.yaml
rename to charts/jackett/2.0.0/Chart.yaml
index 634b4fe58f9..0d9906d2357 100644
--- a/charts/jackett/1.6.4/Chart.yaml
+++ b/charts/jackett/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: jackett
+<<<<<<< HEAD:charts/jackett/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/jackett/2.0.0/Chart.yaml
 upstream_version: 7.0.1
 appVersion: version-v0.17.153
 description: API Support for your favorite torrent trackers.
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/jackett/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/jackett/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/jackett/1.6.4/README.md b/charts/jackett/2.0.0/README.md
similarity index 76%
rename from charts/jackett/1.6.4/README.md
rename to charts/jackett/2.0.0/README.md
index 014a333851a..e6e7ab61da7 100644
--- a/charts/jackett/1.6.4/README.md
+++ b/charts/jackett/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/jackett/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: version-v0.17.153](https://img.shields.io/badge/AppVersion-version--v0.17.153-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: version-v0.17.153](https://img.shields.io/badge/AppVersion-version--v0.17.153-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/jackett/2.0.0/README.md
 
 API Support for your favorite torrent trackers.
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/jackett/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/jackett/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/jackett/1.6.4/app-readme.md b/charts/jackett/2.0.0/app-readme.md
similarity index 97%
rename from charts/jackett/1.6.4/app-readme.md
rename to charts/jackett/2.0.0/app-readme.md
index 6b9a1be91d3..0114ba37abe 100644
--- a/charts/jackett/1.6.4/app-readme.md
+++ b/charts/jackett/2.0.0/app-readme.md
@@ -1,2 +1 @@
 API Support for your favorite torrent trackers.
-
diff --git a/charts/jackett/2.0.0/charts/common-2.0.0.tgz b/charts/jackett/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/jackett/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/jackett/1.6.4/docs/CONFIG.md b/charts/jackett/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/jackett/1.6.4/docs/CONFIG.md
rename to charts/jackett/2.0.0/docs/CONFIG.md
diff --git a/charts/home-assistant/1.6.4/docs/CONFIG.md.gotmpl b/charts/jackett/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/home-assistant/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/jackett/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/jackett/1.6.4/questions.yaml b/charts/jackett/2.0.0/questions.yaml
similarity index 84%
rename from charts/jackett/1.6.4/questions.yaml
rename to charts/jackett/2.0.0/questions.yaml
index 3b2ab6a185e..96cda6e1736 100644
--- a/charts/jackett/1.6.4/questions.yaml
+++ b/charts/jackett/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 9117
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 9117
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/home-assistant/1.6.4/templates/common.yaml b/charts/jackett/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/home-assistant/1.6.4/templates/common.yaml
rename to charts/jackett/2.0.0/templates/common.yaml
diff --git a/charts/jackett/1.6.4/test_values.yaml b/charts/jackett/2.0.0/test_values.yaml
similarity index 95%
rename from charts/jackett/1.6.4/test_values.yaml
rename to charts/jackett/2.0.0/test_values.yaml
index dee72753ed3..76476ceb7de 100644
--- a/charts/jackett/1.6.4/test_values.yaml
+++ b/charts/jackett/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 9117
+services:
+  main:
+    port:
+      port: 9117
 
 env: {}
   # TZ: UTC
diff --git a/charts/jackett/1.6.4/values.yaml b/charts/jackett/2.0.0/values.yaml
similarity index 95%
rename from charts/jackett/1.6.4/values.yaml
rename to charts/jackett/2.0.0/values.yaml
index 6bbfabb0fec..e37ca01e0e1 100644
--- a/charts/jackett/1.6.4/values.yaml
+++ b/charts/jackett/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 9117
+services:
+  main:
+    port:
+      port: 9117
 
 env: {}
   # TZ: UTC
diff --git a/charts/jellyfin/1.6.4/Chart.lock b/charts/jellyfin/1.6.4/Chart.lock
deleted file mode 100644
index b02d9329c9f..00000000000
--- a/charts/jellyfin/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:47.101569012Z"
diff --git a/charts/jellyfin/1.6.4/charts/common-1.6.7.tgz b/charts/jellyfin/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/jellyfin/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/jellyfin/1.6.4/.helmignore b/charts/jellyfin/2.0.0/.helmignore
similarity index 100%
rename from charts/jellyfin/1.6.4/.helmignore
rename to charts/jellyfin/2.0.0/.helmignore
diff --git a/charts/jellyfin/1.6.4/Chart.yaml b/charts/jellyfin/2.0.0/Chart.yaml
similarity index 77%
rename from charts/jellyfin/1.6.4/Chart.yaml
rename to charts/jellyfin/2.0.0/Chart.yaml
index bc793a94c0f..8fea37106be 100644
--- a/charts/jellyfin/1.6.4/Chart.yaml
+++ b/charts/jellyfin/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: jellyfin
+<<<<<<< HEAD:charts/jellyfin/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/jellyfin/2.0.0/Chart.yaml
 upstream_version: 4.2.1
 appVersion: 10.6.4
 description: Jellyfin is a Free Software Media System
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/jellyfin/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/jellyfin/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/jellyfin/1.6.4/README.md b/charts/jellyfin/2.0.0/README.md
similarity index 77%
rename from charts/jellyfin/1.6.4/README.md
rename to charts/jellyfin/2.0.0/README.md
index cee9cff616c..7573fe2bd2e 100644
--- a/charts/jellyfin/1.6.4/README.md
+++ b/charts/jellyfin/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/jellyfin/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.6.4](https://img.shields.io/badge/AppVersion-10.6.4-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.6.4](https://img.shields.io/badge/AppVersion-10.6.4-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/jellyfin/2.0.0/README.md
 
 Jellyfin is a Free Software Media System
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/jellyfin/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/jellyfin/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/jellyfin/1.6.4/app-readme.md b/charts/jellyfin/2.0.0/app-readme.md
similarity index 97%
rename from charts/jellyfin/1.6.4/app-readme.md
rename to charts/jellyfin/2.0.0/app-readme.md
index 18ff027a2b6..59ed9fc3aef 100644
--- a/charts/jellyfin/1.6.4/app-readme.md
+++ b/charts/jellyfin/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Jellyfin is a Free Software Media System
-
diff --git a/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz b/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/jellyfin/1.6.4/docs/CONFIG.md b/charts/jellyfin/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/jellyfin/1.6.4/docs/CONFIG.md
rename to charts/jellyfin/2.0.0/docs/CONFIG.md
diff --git a/charts/jackett/1.6.4/docs/CONFIG.md.gotmpl b/charts/jellyfin/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/jackett/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/jellyfin/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/jellyfin/1.6.4/questions.yaml b/charts/jellyfin/2.0.0/questions.yaml
similarity index 86%
rename from charts/jellyfin/1.6.4/questions.yaml
rename to charts/jellyfin/2.0.0/questions.yaml
index 1e72cf5ac0b..23c777875f2 100644
--- a/charts/jellyfin/1.6.4/questions.yaml
+++ b/charts/jellyfin/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8096
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8096
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/jackett/1.6.4/templates/common.yaml b/charts/jellyfin/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/jackett/1.6.4/templates/common.yaml
rename to charts/jellyfin/2.0.0/templates/common.yaml
diff --git a/charts/jellyfin/1.6.4/test_values.yaml b/charts/jellyfin/2.0.0/test_values.yaml
similarity index 95%
rename from charts/jellyfin/1.6.4/test_values.yaml
rename to charts/jellyfin/2.0.0/test_values.yaml
index 044bfb6907e..25c75b87731 100644
--- a/charts/jellyfin/1.6.4/test_values.yaml
+++ b/charts/jellyfin/2.0.0/test_values.yaml
@@ -9,9 +9,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8096
+services:
+  main:
+    port:
+      port: 8096
 
 persistence:
   config:
diff --git a/charts/jellyfin/1.6.4/values.yaml b/charts/jellyfin/2.0.0/values.yaml
similarity index 95%
rename from charts/jellyfin/1.6.4/values.yaml
rename to charts/jellyfin/2.0.0/values.yaml
index 6057436adea..ffab01d8501 100644
--- a/charts/jellyfin/1.6.4/values.yaml
+++ b/charts/jellyfin/2.0.0/values.yaml
@@ -9,9 +9,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8096
+services:
+  main:
+    port:
+      port: 8096
 
 persistence:
   config:
diff --git a/charts/kms/1.6.4/Chart.lock b/charts/kms/1.6.4/Chart.lock
deleted file mode 100644
index 9b30e161af2..00000000000
--- a/charts/kms/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:44.443192409Z"
diff --git a/charts/kms/1.6.4/charts/common-1.6.7.tgz b/charts/kms/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/kms/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/kms/1.6.4/.helmignore b/charts/kms/2.0.0/.helmignore
similarity index 100%
rename from charts/kms/1.6.4/.helmignore
rename to charts/kms/2.0.0/.helmignore
diff --git a/charts/kms/1.6.4/Chart.yaml b/charts/kms/2.0.0/Chart.yaml
similarity index 75%
rename from charts/kms/1.6.4/Chart.yaml
rename to charts/kms/2.0.0/Chart.yaml
index dc8ff8e7f70..15682d10bcb 100644
--- a/charts/kms/1.6.4/Chart.yaml
+++ b/charts/kms/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: kms
+<<<<<<< HEAD:charts/kms/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/kms/2.0.0/Chart.yaml
 # upstream_version:
 appVersion: latest
 description: Private Windows Activation Server for development and testing
@@ -17,7 +21,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/kms/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/kms/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/kms/1.6.4/README.md b/charts/kms/2.0.0/README.md
similarity index 76%
rename from charts/kms/1.6.4/README.md
rename to charts/kms/2.0.0/README.md
index 3dffdfda85b..d7981c2a56d 100644
--- a/charts/kms/1.6.4/README.md
+++ b/charts/kms/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/kms/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/kms/2.0.0/README.md
 
 Private Windows Activation Server for development and testing
 
@@ -20,7 +24,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/kms/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/kms/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/kms/1.6.4/app-readme.md b/charts/kms/2.0.0/app-readme.md
similarity index 98%
rename from charts/kms/1.6.4/app-readme.md
rename to charts/kms/2.0.0/app-readme.md
index 960c6a8827c..a522ca83a19 100644
--- a/charts/kms/1.6.4/app-readme.md
+++ b/charts/kms/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Private Windows Activation Server for development and testing
-
diff --git a/charts/kms/2.0.0/charts/common-2.0.0.tgz b/charts/kms/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/kms/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/kms/1.6.4/docs/CONFIG.md b/charts/kms/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/kms/1.6.4/docs/CONFIG.md
rename to charts/kms/2.0.0/docs/CONFIG.md
diff --git a/charts/jellyfin/1.6.4/docs/CONFIG.md.gotmpl b/charts/kms/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/jellyfin/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/kms/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/kms/1.6.4/questions.yaml b/charts/kms/2.0.0/questions.yaml
similarity index 80%
rename from charts/kms/1.6.4/questions.yaml
rename to charts/kms/2.0.0/questions.yaml
index 9ca1e5c6d61..8441db7e786 100644
--- a/charts/kms/1.6.4/questions.yaml
+++ b/charts/kms/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 1688
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 1688
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/jellyfin/1.6.4/templates/common.yaml b/charts/kms/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/jellyfin/1.6.4/templates/common.yaml
rename to charts/kms/2.0.0/templates/common.yaml
diff --git a/charts/kms/1.6.4/test_values.yaml b/charts/kms/2.0.0/test_values.yaml
similarity index 89%
rename from charts/kms/1.6.4/test_values.yaml
rename to charts/kms/2.0.0/test_values.yaml
index 1067b1d9170..9f5f36262bb 100644
--- a/charts/kms/1.6.4/test_values.yaml
+++ b/charts/kms/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 1688
+services:
+  main:
+    port:
+      port: 1688
 
 env: {}
   # TZ: UTC
diff --git a/charts/kms/1.6.4/values.yaml b/charts/kms/2.0.0/values.yaml
similarity index 89%
rename from charts/kms/1.6.4/values.yaml
rename to charts/kms/2.0.0/values.yaml
index 71896869f76..996f05e6a1e 100644
--- a/charts/kms/1.6.4/values.yaml
+++ b/charts/kms/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 1688
+services:
+  main:
+    port:
+      port: 1688
 
 env: {}
   # TZ: UTC
diff --git a/charts/lazylibrarian/1.6.4/Chart.lock b/charts/lazylibrarian/1.6.4/Chart.lock
deleted file mode 100644
index cfb48b4bce4..00000000000
--- a/charts/lazylibrarian/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:41.842085765Z"
diff --git a/charts/lazylibrarian/1.6.4/charts/common-1.6.7.tgz b/charts/lazylibrarian/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/lazylibrarian/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/lazylibrarian/1.6.4/.helmignore b/charts/lazylibrarian/2.0.0/.helmignore
similarity index 100%
rename from charts/lazylibrarian/1.6.4/.helmignore
rename to charts/lazylibrarian/2.0.0/.helmignore
diff --git a/charts/lazylibrarian/1.6.4/Chart.yaml b/charts/lazylibrarian/2.0.0/Chart.yaml
similarity index 75%
rename from charts/lazylibrarian/1.6.4/Chart.yaml
rename to charts/lazylibrarian/2.0.0/Chart.yaml
index 3b08083e758..8448dcbf2f5 100644
--- a/charts/lazylibrarian/1.6.4/Chart.yaml
+++ b/charts/lazylibrarian/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: lazylibrarian
+<<<<<<< HEAD:charts/lazylibrarian/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/lazylibrarian/2.0.0/Chart.yaml
 upstream_version: 2.1.0
 appVersion: 1.7.2
 description: Get all your books, like series with Sonarr...
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/lazylibrarian/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/lazylibrarian/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/lazylibrarian/1.6.4/README.md b/charts/lazylibrarian/2.0.0/README.md
similarity index 76%
rename from charts/lazylibrarian/1.6.4/README.md
rename to charts/lazylibrarian/2.0.0/README.md
index 1325b0031c1..1132ecfad03 100644
--- a/charts/lazylibrarian/1.6.4/README.md
+++ b/charts/lazylibrarian/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/lazylibrarian/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.2](https://img.shields.io/badge/AppVersion-1.7.2-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.2](https://img.shields.io/badge/AppVersion-1.7.2-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/lazylibrarian/2.0.0/README.md
 
 Get all your books, like series with Sonarr...
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/lazylibrarian/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/lazylibrarian/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/lazylibrarian/1.6.4/app-readme.md b/charts/lazylibrarian/2.0.0/app-readme.md
similarity index 97%
rename from charts/lazylibrarian/1.6.4/app-readme.md
rename to charts/lazylibrarian/2.0.0/app-readme.md
index 00311a3551d..2e2d5eaf764 100644
--- a/charts/lazylibrarian/1.6.4/app-readme.md
+++ b/charts/lazylibrarian/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Get all your books, like series with Sonarr...
-
diff --git a/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz b/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/lazylibrarian/1.6.4/docs/CONFIG.md b/charts/lazylibrarian/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/lazylibrarian/1.6.4/docs/CONFIG.md
rename to charts/lazylibrarian/2.0.0/docs/CONFIG.md
diff --git a/charts/kms/1.6.4/docs/CONFIG.md.gotmpl b/charts/lazylibrarian/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/kms/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/lazylibrarian/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/lazylibrarian/1.6.4/questions.yaml b/charts/lazylibrarian/2.0.0/questions.yaml
similarity index 88%
rename from charts/lazylibrarian/1.6.4/questions.yaml
rename to charts/lazylibrarian/2.0.0/questions.yaml
index 902101c6701..ae28ed92b50 100644
--- a/charts/lazylibrarian/1.6.4/questions.yaml
+++ b/charts/lazylibrarian/2.0.0/questions.yaml
@@ -113,37 +113,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 5299
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 5299
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/kms/1.6.4/templates/common.yaml b/charts/lazylibrarian/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/kms/1.6.4/templates/common.yaml
rename to charts/lazylibrarian/2.0.0/templates/common.yaml
diff --git a/charts/lazylibrarian/1.6.4/test_values.yaml b/charts/lazylibrarian/2.0.0/test_values.yaml
similarity index 96%
rename from charts/lazylibrarian/1.6.4/test_values.yaml
rename to charts/lazylibrarian/2.0.0/test_values.yaml
index ed8e2f974e9..570fe4b4f49 100644
--- a/charts/lazylibrarian/1.6.4/test_values.yaml
+++ b/charts/lazylibrarian/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 5299
+services:
+  main:
+    port:
+      port: 5299
 
 env: {}
   # TZ: UTC
diff --git a/charts/lazylibrarian/1.6.4/values.yaml b/charts/lazylibrarian/2.0.0/values.yaml
similarity index 95%
rename from charts/lazylibrarian/1.6.4/values.yaml
rename to charts/lazylibrarian/2.0.0/values.yaml
index bcd9c3ac8de..56b7dc4a9ee 100644
--- a/charts/lazylibrarian/1.6.4/values.yaml
+++ b/charts/lazylibrarian/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 5299
+services:
+  main:
+    port:
+      port: 5299
 
 env: {}
   # TZ: UTC
diff --git a/charts/lidarr/1.6.4/Chart.lock b/charts/lidarr/1.6.4/Chart.lock
deleted file mode 100644
index b816ef9d4dd..00000000000
--- a/charts/lidarr/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:39.142147146Z"
diff --git a/charts/lidarr/1.6.4/charts/common-1.6.7.tgz b/charts/lidarr/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/lidarr/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/lidarr/1.6.4/.helmignore b/charts/lidarr/2.0.0/.helmignore
similarity index 100%
rename from charts/lidarr/1.6.4/.helmignore
rename to charts/lidarr/2.0.0/.helmignore
diff --git a/charts/lidarr/1.6.4/Chart.yaml b/charts/lidarr/2.0.0/Chart.yaml
similarity index 77%
rename from charts/lidarr/1.6.4/Chart.yaml
rename to charts/lidarr/2.0.0/Chart.yaml
index f503b828591..e683dec2f00 100644
--- a/charts/lidarr/1.6.4/Chart.yaml
+++ b/charts/lidarr/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: lidarr
+<<<<<<< HEAD:charts/lidarr/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/lidarr/2.0.0/Chart.yaml
 upstream_version: 7.1.0
 appVersion: 0.8.0.1886
 description: Looks and smells like Sonarr but made for music
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/lidarr/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/lidarr/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/lidarr/1.6.4/README.md b/charts/lidarr/2.0.0/README.md
similarity index 77%
rename from charts/lidarr/1.6.4/README.md
rename to charts/lidarr/2.0.0/README.md
index fa995f3a06a..48ff242dab3 100644
--- a/charts/lidarr/1.6.4/README.md
+++ b/charts/lidarr/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/lidarr/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.0.1886](https://img.shields.io/badge/AppVersion-0.8.0.1886-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.0.1886](https://img.shields.io/badge/AppVersion-0.8.0.1886-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/lidarr/2.0.0/README.md
 
 Looks and smells like Sonarr but made for music
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/lidarr/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/lidarr/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/lidarr/1.6.4/app-readme.md b/charts/lidarr/2.0.0/app-readme.md
similarity index 97%
rename from charts/lidarr/1.6.4/app-readme.md
rename to charts/lidarr/2.0.0/app-readme.md
index 895d2db1648..67967314442 100644
--- a/charts/lidarr/1.6.4/app-readme.md
+++ b/charts/lidarr/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Looks and smells like Sonarr but made for music
-
diff --git a/charts/lidarr/2.0.0/charts/common-2.0.0.tgz b/charts/lidarr/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/lidarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/lidarr/1.6.4/docs/CONFIG.md b/charts/lidarr/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/lidarr/1.6.4/docs/CONFIG.md
rename to charts/lidarr/2.0.0/docs/CONFIG.md
diff --git a/charts/lazylibrarian/1.6.4/docs/CONFIG.md.gotmpl b/charts/lidarr/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/lazylibrarian/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/lidarr/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/lidarr/1.6.4/questions.yaml b/charts/lidarr/2.0.0/questions.yaml
similarity index 88%
rename from charts/lidarr/1.6.4/questions.yaml
rename to charts/lidarr/2.0.0/questions.yaml
index da2a479b824..fef113c613e 100644
--- a/charts/lidarr/1.6.4/questions.yaml
+++ b/charts/lidarr/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8686
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8686
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/lazylibrarian/1.6.4/templates/common.yaml b/charts/lidarr/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/lazylibrarian/1.6.4/templates/common.yaml
rename to charts/lidarr/2.0.0/templates/common.yaml
diff --git a/charts/lidarr/1.6.4/test_values.yaml b/charts/lidarr/2.0.0/test_values.yaml
similarity index 97%
rename from charts/lidarr/1.6.4/test_values.yaml
rename to charts/lidarr/2.0.0/test_values.yaml
index 6825537a8b3..c86cabd43c8 100644
--- a/charts/lidarr/1.6.4/test_values.yaml
+++ b/charts/lidarr/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8686
+services:
+  main:
+    port:
+      port: 8686
 
 env: {}
   # TZ: UTC
diff --git a/charts/lidarr/1.6.4/values.yaml b/charts/lidarr/2.0.0/values.yaml
similarity index 97%
rename from charts/lidarr/1.6.4/values.yaml
rename to charts/lidarr/2.0.0/values.yaml
index 4bdf5e6773c..44991bd3b95 100644
--- a/charts/lidarr/1.6.4/values.yaml
+++ b/charts/lidarr/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8686
+services:
+  main:
+    port:
+      port: 8686
 
 env: {}
   # TZ: UTC
diff --git a/charts/lychee/1.6.4/Chart.lock b/charts/lychee/1.6.4/Chart.lock
deleted file mode 100644
index c1e66da24ca..00000000000
--- a/charts/lychee/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:36.368382561Z"
diff --git a/charts/lychee/1.6.4/charts/common-1.6.7.tgz b/charts/lychee/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/lychee/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/lychee/1.6.4/.helmignore b/charts/lychee/2.0.0/.helmignore
similarity index 100%
rename from charts/lychee/1.6.4/.helmignore
rename to charts/lychee/2.0.0/.helmignore
diff --git a/charts/lychee/1.6.4/Chart.yaml b/charts/lychee/2.0.0/Chart.yaml
similarity index 76%
rename from charts/lychee/1.6.4/Chart.yaml
rename to charts/lychee/2.0.0/Chart.yaml
index bd9dd8a3ff9..e9a765f3a40 100644
--- a/charts/lychee/1.6.4/Chart.yaml
+++ b/charts/lychee/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: lychee
+<<<<<<< HEAD:charts/lychee/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/lychee/2.0.0/Chart.yaml
 upstream_version: 2.3.1
 appVersion: 4.0.8
 description: Lychee is a free photo-management tool, which runs on your server or web-space
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/lychee/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/lychee/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/lychee/1.6.4/README.md b/charts/lychee/2.0.0/README.md
similarity index 77%
rename from charts/lychee/1.6.4/README.md
rename to charts/lychee/2.0.0/README.md
index 9fbfce0b1ca..b325a155b80 100644
--- a/charts/lychee/1.6.4/README.md
+++ b/charts/lychee/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/lychee/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.8](https://img.shields.io/badge/AppVersion-4.0.8-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.8](https://img.shields.io/badge/AppVersion-4.0.8-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/lychee/2.0.0/README.md
 
 Lychee is a free photo-management tool, which runs on your server or web-space
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/lychee/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/lychee/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/lychee/1.6.4/app-readme.md b/charts/lychee/2.0.0/app-readme.md
similarity index 98%
rename from charts/lychee/1.6.4/app-readme.md
rename to charts/lychee/2.0.0/app-readme.md
index eabedbf5c4a..8d3611974d3 100644
--- a/charts/lychee/1.6.4/app-readme.md
+++ b/charts/lychee/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Lychee is a free photo-management tool, which runs on your server or web-space
-
diff --git a/charts/lychee/2.0.0/charts/common-2.0.0.tgz b/charts/lychee/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/lychee/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/lychee/1.6.4/docs/CONFIG.md b/charts/lychee/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/lychee/1.6.4/docs/CONFIG.md
rename to charts/lychee/2.0.0/docs/CONFIG.md
diff --git a/charts/lidarr/1.6.4/docs/CONFIG.md.gotmpl b/charts/lychee/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/lidarr/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/lychee/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/lychee/1.6.4/questions.yaml b/charts/lychee/2.0.0/questions.yaml
similarity index 88%
rename from charts/lychee/1.6.4/questions.yaml
rename to charts/lychee/2.0.0/questions.yaml
index 7fd84374393..915e8c813b0 100644
--- a/charts/lychee/1.6.4/questions.yaml
+++ b/charts/lychee/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 80
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/handbrake/1.3.4/templates/NOTES.txt b/charts/lychee/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/handbrake/1.3.4/templates/NOTES.txt
rename to charts/lychee/2.0.0/templates/NOTES.txt
diff --git a/charts/lidarr/1.6.4/templates/common.yaml b/charts/lychee/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/lidarr/1.6.4/templates/common.yaml
rename to charts/lychee/2.0.0/templates/common.yaml
diff --git a/charts/lychee/1.6.4/test_values.yaml b/charts/lychee/2.0.0/test_values.yaml
similarity index 98%
rename from charts/lychee/1.6.4/test_values.yaml
rename to charts/lychee/2.0.0/test_values.yaml
index c252ab2d473..7ee35445142 100644
--- a/charts/lychee/1.6.4/test_values.yaml
+++ b/charts/lychee/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # PHP_TZ: UTC
diff --git a/charts/lychee/1.6.4/values.yaml b/charts/lychee/2.0.0/values.yaml
similarity index 98%
rename from charts/lychee/1.6.4/values.yaml
rename to charts/lychee/2.0.0/values.yaml
index d35055b33b6..dc0c7ddbcbc 100644
--- a/charts/lychee/1.6.4/values.yaml
+++ b/charts/lychee/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # PHP_TZ: UTC
diff --git a/charts/navidrome/1.6.4/Chart.lock b/charts/navidrome/1.6.4/Chart.lock
deleted file mode 100644
index b022e42f163..00000000000
--- a/charts/navidrome/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:33.640364973Z"
diff --git a/charts/navidrome/1.6.4/charts/common-1.6.7.tgz b/charts/navidrome/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/navidrome/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/navidrome/1.6.4/.helmignore b/charts/navidrome/2.0.0/.helmignore
similarity index 100%
rename from charts/navidrome/1.6.4/.helmignore
rename to charts/navidrome/2.0.0/.helmignore
diff --git a/charts/navidrome/1.6.4/Chart.yaml b/charts/navidrome/2.0.0/Chart.yaml
similarity index 76%
rename from charts/navidrome/1.6.4/Chart.yaml
rename to charts/navidrome/2.0.0/Chart.yaml
index 37385573bb3..3977e7b7780 100644
--- a/charts/navidrome/1.6.4/Chart.yaml
+++ b/charts/navidrome/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: navidrome
+<<<<<<< HEAD:charts/navidrome/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/navidrome/2.0.0/Chart.yaml
 upstream_version: 2.3.1
 appVersion: 0.39.0
 description: Navidrome is an open source web-based music collection server and streamer
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/navidrome/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/navidrome/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/navidrome/1.6.4/README.md b/charts/navidrome/2.0.0/README.md
similarity index 77%
rename from charts/navidrome/1.6.4/README.md
rename to charts/navidrome/2.0.0/README.md
index 5333c944bae..8328044c502 100644
--- a/charts/navidrome/1.6.4/README.md
+++ b/charts/navidrome/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/navidrome/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.0](https://img.shields.io/badge/AppVersion-0.39.0-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.0](https://img.shields.io/badge/AppVersion-0.39.0-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/navidrome/2.0.0/README.md
 
 Navidrome is an open source web-based music collection server and streamer
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/navidrome/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/navidrome/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/navidrome/1.6.4/app-readme.md b/charts/navidrome/2.0.0/app-readme.md
similarity index 98%
rename from charts/navidrome/1.6.4/app-readme.md
rename to charts/navidrome/2.0.0/app-readme.md
index 57bb5cfd9a6..925674d2d74 100644
--- a/charts/navidrome/1.6.4/app-readme.md
+++ b/charts/navidrome/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Navidrome is an open source web-based music collection server and streamer
-
diff --git a/charts/navidrome/2.0.0/charts/common-2.0.0.tgz b/charts/navidrome/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/navidrome/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/navidrome/1.6.4/docs/CONFIG.md b/charts/navidrome/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/navidrome/1.6.4/docs/CONFIG.md
rename to charts/navidrome/2.0.0/docs/CONFIG.md
diff --git a/charts/lychee/1.6.4/docs/CONFIG.md.gotmpl b/charts/navidrome/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/lychee/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/navidrome/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/navidrome/1.6.4/questions.yaml b/charts/navidrome/2.0.0/questions.yaml
similarity index 86%
rename from charts/navidrome/1.6.4/questions.yaml
rename to charts/navidrome/2.0.0/questions.yaml
index b84fc542074..3ba8276c42f 100644
--- a/charts/navidrome/1.6.4/questions.yaml
+++ b/charts/navidrome/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 4533
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 4533
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/lychee/1.6.4/templates/NOTES.txt b/charts/navidrome/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/lychee/1.6.4/templates/NOTES.txt
rename to charts/navidrome/2.0.0/templates/NOTES.txt
diff --git a/charts/lychee/1.6.4/templates/common.yaml b/charts/navidrome/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/lychee/1.6.4/templates/common.yaml
rename to charts/navidrome/2.0.0/templates/common.yaml
diff --git a/charts/navidrome/1.6.4/test_values.yaml b/charts/navidrome/2.0.0/test_values.yaml
similarity index 97%
rename from charts/navidrome/1.6.4/test_values.yaml
rename to charts/navidrome/2.0.0/test_values.yaml
index 8018d4a4164..d437943891a 100644
--- a/charts/navidrome/1.6.4/test_values.yaml
+++ b/charts/navidrome/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 4533
+services:
+  main:
+    port:
+      port: 4533
 
 env:
   ND_SCANINTERVAL: 15m
diff --git a/charts/navidrome/1.6.4/values.yaml b/charts/navidrome/2.0.0/values.yaml
similarity index 97%
rename from charts/navidrome/1.6.4/values.yaml
rename to charts/navidrome/2.0.0/values.yaml
index 099ad2f436b..32bd1d8d0e5 100644
--- a/charts/navidrome/1.6.4/values.yaml
+++ b/charts/navidrome/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 4533
+services:
+  main:
+    port:
+      port: 4533
 
 env:
   ND_SCANINTERVAL: 15m
diff --git a/charts/node-red/1.6.4/Chart.lock b/charts/node-red/1.6.4/Chart.lock
deleted file mode 100644
index 11aff5ff2d6..00000000000
--- a/charts/node-red/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:30.943485332Z"
diff --git a/charts/node-red/1.6.4/charts/common-1.6.7.tgz b/charts/node-red/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/node-red/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/node-red/1.6.4/.helmignore b/charts/node-red/2.0.0/.helmignore
similarity index 100%
rename from charts/node-red/1.6.4/.helmignore
rename to charts/node-red/2.0.0/.helmignore
diff --git a/charts/node-red/1.6.4/Chart.yaml b/charts/node-red/2.0.0/Chart.yaml
similarity index 74%
rename from charts/node-red/1.6.4/Chart.yaml
rename to charts/node-red/2.0.0/Chart.yaml
index f913d4f4926..dbe73dba660 100644
--- a/charts/node-red/1.6.4/Chart.yaml
+++ b/charts/node-red/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: node-red
+<<<<<<< HEAD:charts/node-red/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/node-red/2.0.0/Chart.yaml
 upstream_version: 5.2.1
 appVersion: 1.2.5
 description: Node-RED is low-code programming for event-driven applications
@@ -19,7 +23,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/node-red/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/node-red/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/node-red/1.6.4/README.md b/charts/node-red/2.0.0/README.md
similarity index 76%
rename from charts/node-red/1.6.4/README.md
rename to charts/node-red/2.0.0/README.md
index 15091737ea7..c65f82d6efb 100644
--- a/charts/node-red/1.6.4/README.md
+++ b/charts/node-red/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/node-red/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.5](https://img.shields.io/badge/AppVersion-1.2.5-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.5](https://img.shields.io/badge/AppVersion-1.2.5-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/node-red/2.0.0/README.md
 
 Node-RED is low-code programming for event-driven applications
 
@@ -21,7 +25,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/node-red/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/node-red/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/node-red/1.6.4/app-readme.md b/charts/node-red/2.0.0/app-readme.md
similarity index 98%
rename from charts/node-red/1.6.4/app-readme.md
rename to charts/node-red/2.0.0/app-readme.md
index 3da24e3b944..ddc299d838a 100644
--- a/charts/node-red/1.6.4/app-readme.md
+++ b/charts/node-red/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Node-RED is low-code programming for event-driven applications
-
diff --git a/charts/node-red/2.0.0/charts/common-2.0.0.tgz b/charts/node-red/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/node-red/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/node-red/1.6.4/docs/CONFIG.md b/charts/node-red/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/node-red/1.6.4/docs/CONFIG.md
rename to charts/node-red/2.0.0/docs/CONFIG.md
diff --git a/charts/navidrome/1.6.4/docs/CONFIG.md.gotmpl b/charts/node-red/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/navidrome/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/node-red/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/node-red/1.6.4/questions.yaml b/charts/node-red/2.0.0/questions.yaml
similarity index 84%
rename from charts/node-red/1.6.4/questions.yaml
rename to charts/node-red/2.0.0/questions.yaml
index e06377c337d..0a09689ab29 100644
--- a/charts/node-red/1.6.4/questions.yaml
+++ b/charts/node-red/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 1880
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 1880
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/navidrome/1.6.4/templates/common.yaml b/charts/node-red/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/navidrome/1.6.4/templates/common.yaml
rename to charts/node-red/2.0.0/templates/common.yaml
diff --git a/charts/node-red/1.6.4/test_values.yaml b/charts/node-red/2.0.0/test_values.yaml
similarity index 92%
rename from charts/node-red/1.6.4/test_values.yaml
rename to charts/node-red/2.0.0/test_values.yaml
index 0d1c4f5c343..696a909634b 100644
--- a/charts/node-red/1.6.4/test_values.yaml
+++ b/charts/node-red/2.0.0/test_values.yaml
@@ -17,9 +17,10 @@ env: {}
   # NODE_RED_ENABLE_SAFE_MODE:
   # FLOWS:
 
-service:
-  port:
-    port: 1880
+services:
+  main:
+    port:
+      port: 1880
 
 persistence:
   data:
diff --git a/charts/node-red/1.6.4/values.yaml b/charts/node-red/2.0.0/values.yaml
similarity index 92%
rename from charts/node-red/1.6.4/values.yaml
rename to charts/node-red/2.0.0/values.yaml
index 3b5c0461095..617829954f8 100644
--- a/charts/node-red/1.6.4/values.yaml
+++ b/charts/node-red/2.0.0/values.yaml
@@ -17,9 +17,10 @@ env: {}
   # NODE_RED_ENABLE_SAFE_MODE:
   # FLOWS:
 
-service:
-  port:
-    port: 1880
+services:
+  main:
+    port:
+      port: 1880
 
 persistence:
   data:
diff --git a/charts/nzbget/1.6.4/Chart.lock b/charts/nzbget/1.6.4/Chart.lock
deleted file mode 100644
index 91340f2e3f1..00000000000
--- a/charts/nzbget/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:28.229767254Z"
diff --git a/charts/nzbget/1.6.4/charts/common-1.6.7.tgz b/charts/nzbget/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/nzbget/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/nzbget/1.6.4/.helmignore b/charts/nzbget/2.0.0/.helmignore
similarity index 100%
rename from charts/nzbget/1.6.4/.helmignore
rename to charts/nzbget/2.0.0/.helmignore
diff --git a/charts/nzbget/1.6.4/Chart.yaml b/charts/nzbget/2.0.0/Chart.yaml
similarity index 74%
rename from charts/nzbget/1.6.4/Chart.yaml
rename to charts/nzbget/2.0.0/Chart.yaml
index 33ce7bd59d2..3c082317455 100644
--- a/charts/nzbget/1.6.4/Chart.yaml
+++ b/charts/nzbget/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: nzbget
+<<<<<<< HEAD:charts/nzbget/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/nzbget/2.0.0/Chart.yaml
 upstream_version: 7.3.1
 appVersion: v21.0
 description: NZBGet is a Usenet downloader client
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/nzbget/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/nzbget/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/nzbget/1.6.4/README.md b/charts/nzbget/2.0.0/README.md
similarity index 77%
rename from charts/nzbget/1.6.4/README.md
rename to charts/nzbget/2.0.0/README.md
index 7d930ce7a9b..e1b862be18e 100644
--- a/charts/nzbget/1.6.4/README.md
+++ b/charts/nzbget/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/nzbget/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v21.0](https://img.shields.io/badge/AppVersion-v21.0-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v21.0](https://img.shields.io/badge/AppVersion-v21.0-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/nzbget/2.0.0/README.md
 
 NZBGet is a Usenet downloader client
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/nzbget/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/nzbget/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/nzbget/1.6.4/app-readme.md b/charts/nzbget/2.0.0/app-readme.md
similarity index 97%
rename from charts/nzbget/1.6.4/app-readme.md
rename to charts/nzbget/2.0.0/app-readme.md
index 274e79baa51..91df8011933 100644
--- a/charts/nzbget/1.6.4/app-readme.md
+++ b/charts/nzbget/2.0.0/app-readme.md
@@ -1,2 +1 @@
 NZBGet is a Usenet downloader client
-
diff --git a/charts/nzbget/2.0.0/charts/common-2.0.0.tgz b/charts/nzbget/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/nzbget/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/nzbget/1.6.4/docs/CONFIG.md b/charts/nzbget/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/nzbget/1.6.4/docs/CONFIG.md
rename to charts/nzbget/2.0.0/docs/CONFIG.md
diff --git a/charts/node-red/1.6.4/docs/CONFIG.md.gotmpl b/charts/nzbget/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/node-red/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/nzbget/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/nzbget/1.6.4/questions.yaml b/charts/nzbget/2.0.0/questions.yaml
similarity index 86%
rename from charts/nzbget/1.6.4/questions.yaml
rename to charts/nzbget/2.0.0/questions.yaml
index 2dbf17573fd..19b2782cc30 100644
--- a/charts/nzbget/1.6.4/questions.yaml
+++ b/charts/nzbget/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 6789
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 6789
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/navidrome/1.6.4/templates/NOTES.txt b/charts/nzbget/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/navidrome/1.6.4/templates/NOTES.txt
rename to charts/nzbget/2.0.0/templates/NOTES.txt
diff --git a/charts/node-red/1.6.4/templates/common.yaml b/charts/nzbget/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/node-red/1.6.4/templates/common.yaml
rename to charts/nzbget/2.0.0/templates/common.yaml
diff --git a/charts/nzbget/1.6.4/test_values.yaml b/charts/nzbget/2.0.0/test_values.yaml
similarity index 97%
rename from charts/nzbget/1.6.4/test_values.yaml
rename to charts/nzbget/2.0.0/test_values.yaml
index 35f2c68ae5a..18c84065f90 100644
--- a/charts/nzbget/1.6.4/test_values.yaml
+++ b/charts/nzbget/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 6789
+services:
+  main:
+    port:
+      port: 6789
 
 persistence:
   config:
diff --git a/charts/nzbget/1.6.4/values.yaml b/charts/nzbget/2.0.0/values.yaml
similarity index 97%
rename from charts/nzbget/1.6.4/values.yaml
rename to charts/nzbget/2.0.0/values.yaml
index 39d0881353e..59e9abe6be9 100644
--- a/charts/nzbget/1.6.4/values.yaml
+++ b/charts/nzbget/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 6789
+services:
+  main:
+    port:
+      port: 6789
 
 persistence:
   config:
diff --git a/charts/nzbhydra/1.6.4/Chart.lock b/charts/nzbhydra/1.6.4/Chart.lock
deleted file mode 100644
index 7b43a2b4fee..00000000000
--- a/charts/nzbhydra/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:25.534005879Z"
diff --git a/charts/nzbhydra/1.6.4/charts/common-1.6.7.tgz b/charts/nzbhydra/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/nzbhydra/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/nzbhydra/1.6.4/.helmignore b/charts/nzbhydra/2.0.0/.helmignore
similarity index 100%
rename from charts/nzbhydra/1.6.4/.helmignore
rename to charts/nzbhydra/2.0.0/.helmignore
diff --git a/charts/nzbhydra/1.6.4/Chart.yaml b/charts/nzbhydra/2.0.0/Chart.yaml
similarity index 75%
rename from charts/nzbhydra/1.6.4/Chart.yaml
rename to charts/nzbhydra/2.0.0/Chart.yaml
index a0330a85ad0..63785e78657 100644
--- a/charts/nzbhydra/1.6.4/Chart.yaml
+++ b/charts/nzbhydra/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: nzbhydra
+<<<<<<< HEAD:charts/nzbhydra/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/nzbhydra/2.0.0/Chart.yaml
 upstream_version: 5.3.1
 appVersion: v3.8.1
 description: Usenet meta search
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/nzbhydra/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/nzbhydra/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/nzbhydra/1.6.4/README.md b/charts/nzbhydra/2.0.0/README.md
similarity index 76%
rename from charts/nzbhydra/1.6.4/README.md
rename to charts/nzbhydra/2.0.0/README.md
index c04acec2742..7b90d6628dd 100644
--- a/charts/nzbhydra/1.6.4/README.md
+++ b/charts/nzbhydra/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/nzbhydra/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.8.1](https://img.shields.io/badge/AppVersion-v3.8.1-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.8.1](https://img.shields.io/badge/AppVersion-v3.8.1-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/nzbhydra/2.0.0/README.md
 
 Usenet meta search
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/nzbhydra/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/nzbhydra/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/nzbhydra/1.6.4/app-readme.md b/charts/nzbhydra/2.0.0/app-readme.md
similarity index 95%
rename from charts/nzbhydra/1.6.4/app-readme.md
rename to charts/nzbhydra/2.0.0/app-readme.md
index f55265a1c6a..17a981481e6 100644
--- a/charts/nzbhydra/1.6.4/app-readme.md
+++ b/charts/nzbhydra/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Usenet meta search
-
diff --git a/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz b/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/nzbhydra/1.6.4/docs/CONFIG.md b/charts/nzbhydra/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/nzbhydra/1.6.4/docs/CONFIG.md
rename to charts/nzbhydra/2.0.0/docs/CONFIG.md
diff --git a/charts/nzbget/1.6.4/docs/CONFIG.md.gotmpl b/charts/nzbhydra/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/nzbget/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/nzbhydra/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/nzbhydra/1.6.4/questions.yaml b/charts/nzbhydra/2.0.0/questions.yaml
similarity index 86%
rename from charts/nzbhydra/1.6.4/questions.yaml
rename to charts/nzbhydra/2.0.0/questions.yaml
index b16ddce6253..948c302dbd7 100644
--- a/charts/nzbhydra/1.6.4/questions.yaml
+++ b/charts/nzbhydra/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 5076
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 5076
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/nzbget/1.6.4/templates/NOTES.txt b/charts/nzbhydra/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/nzbget/1.6.4/templates/NOTES.txt
rename to charts/nzbhydra/2.0.0/templates/NOTES.txt
diff --git a/charts/nzbget/1.6.4/templates/common.yaml b/charts/nzbhydra/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/nzbget/1.6.4/templates/common.yaml
rename to charts/nzbhydra/2.0.0/templates/common.yaml
diff --git a/charts/nzbhydra/1.6.4/test_values.yaml b/charts/nzbhydra/2.0.0/test_values.yaml
similarity index 96%
rename from charts/nzbhydra/1.6.4/test_values.yaml
rename to charts/nzbhydra/2.0.0/test_values.yaml
index 67c12bfb8c8..9bda297be31 100644
--- a/charts/nzbhydra/1.6.4/test_values.yaml
+++ b/charts/nzbhydra/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 5076
+services:
+  main:
+    port:
+      port: 5076
 
 env: {}
   # TZ: UTC
diff --git a/charts/nzbhydra/1.6.4/values.yaml b/charts/nzbhydra/2.0.0/values.yaml
similarity index 96%
rename from charts/nzbhydra/1.6.4/values.yaml
rename to charts/nzbhydra/2.0.0/values.yaml
index 01840df65f7..64c542d654a 100644
--- a/charts/nzbhydra/1.6.4/values.yaml
+++ b/charts/nzbhydra/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 5076
+services:
+  main:
+    port:
+      port: 5076
 
 env: {}
   # TZ: UTC
diff --git a/charts/ombi/1.6.4/Chart.lock b/charts/ombi/1.6.4/Chart.lock
deleted file mode 100644
index 993818827fb..00000000000
--- a/charts/ombi/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:22.786355869Z"
diff --git a/charts/ombi/1.6.4/charts/common-1.6.7.tgz b/charts/ombi/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/ombi/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/ombi/1.6.4/.helmignore b/charts/ombi/2.0.0/.helmignore
similarity index 100%
rename from charts/ombi/1.6.4/.helmignore
rename to charts/ombi/2.0.0/.helmignore
diff --git a/charts/ombi/1.6.4/Chart.yaml b/charts/ombi/2.0.0/Chart.yaml
similarity index 79%
rename from charts/ombi/1.6.4/Chart.yaml
rename to charts/ombi/2.0.0/Chart.yaml
index 34e6a891a5b..b7c7c3e2550 100644
--- a/charts/ombi/1.6.4/Chart.yaml
+++ b/charts/ombi/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: ombi
+<<<<<<< HEAD:charts/ombi/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/ombi/2.0.0/Chart.yaml
 upstream_version: 8.0.1
 appVersion: 4.0.681
 description: Want a Movie or TV Show on Plex or Emby? Use Ombi!
@@ -24,7 +28,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/ombi/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/ombi/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/ombi/1.6.4/README.md b/charts/ombi/2.0.0/README.md
similarity index 77%
rename from charts/ombi/1.6.4/README.md
rename to charts/ombi/2.0.0/README.md
index 845addfb847..3a9e8c27cd8 100644
--- a/charts/ombi/1.6.4/README.md
+++ b/charts/ombi/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/ombi/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.681](https://img.shields.io/badge/AppVersion-4.0.681-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.681](https://img.shields.io/badge/AppVersion-4.0.681-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/ombi/2.0.0/README.md
 
 Want a Movie or TV Show on Plex or Emby? Use Ombi!
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/ombi/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/ombi/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/ombi/1.6.4/app-readme.md b/charts/ombi/2.0.0/app-readme.md
similarity index 98%
rename from charts/ombi/1.6.4/app-readme.md
rename to charts/ombi/2.0.0/app-readme.md
index fffbc8cd8ca..ca657592236 100644
--- a/charts/ombi/1.6.4/app-readme.md
+++ b/charts/ombi/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Want a Movie or TV Show on Plex or Emby? Use Ombi!
-
diff --git a/charts/ombi/2.0.0/charts/common-2.0.0.tgz b/charts/ombi/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/ombi/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/ombi/1.6.4/docs/CONFIG.md b/charts/ombi/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/ombi/1.6.4/docs/CONFIG.md
rename to charts/ombi/2.0.0/docs/CONFIG.md
diff --git a/charts/nzbhydra/1.6.4/docs/CONFIG.md.gotmpl b/charts/ombi/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/nzbhydra/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/ombi/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/ombi/1.6.4/questions.yaml b/charts/ombi/2.0.0/questions.yaml
similarity index 84%
rename from charts/ombi/1.6.4/questions.yaml
rename to charts/ombi/2.0.0/questions.yaml
index bb212bd3308..555c0bf2125 100644
--- a/charts/ombi/1.6.4/questions.yaml
+++ b/charts/ombi/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 3579
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 3579
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/nzbhydra/1.6.4/templates/common.yaml b/charts/ombi/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/nzbhydra/1.6.4/templates/common.yaml
rename to charts/ombi/2.0.0/templates/common.yaml
diff --git a/charts/ombi/1.6.4/test_values.yaml b/charts/ombi/2.0.0/test_values.yaml
similarity index 93%
rename from charts/ombi/1.6.4/test_values.yaml
rename to charts/ombi/2.0.0/test_values.yaml
index 0b6ab2679fa..598e5aab2ae 100644
--- a/charts/ombi/1.6.4/test_values.yaml
+++ b/charts/ombi/2.0.0/test_values.yaml
@@ -9,9 +9,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 3579
+services:
+  main:
+    port:
+      port: 3579
 
 env: {}
   # TZ: UTC
diff --git a/charts/ombi/1.6.4/values.yaml b/charts/ombi/2.0.0/values.yaml
similarity index 93%
rename from charts/ombi/1.6.4/values.yaml
rename to charts/ombi/2.0.0/values.yaml
index ab470885e69..16ee2ee397e 100644
--- a/charts/ombi/1.6.4/values.yaml
+++ b/charts/ombi/2.0.0/values.yaml
@@ -9,9 +9,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 3579
+services:
+  main:
+    port:
+      port: 3579
 
 env: {}
   # TZ: UTC
diff --git a/charts/organizr/1.6.4/Chart.lock b/charts/organizr/1.6.4/Chart.lock
deleted file mode 100644
index 5487cdb619b..00000000000
--- a/charts/organizr/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:20.084053182Z"
diff --git a/charts/organizr/1.6.4/charts/common-1.6.7.tgz b/charts/organizr/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/organizr/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/organizr/1.6.4/.helmignore b/charts/organizr/2.0.0/.helmignore
similarity index 100%
rename from charts/organizr/1.6.4/.helmignore
rename to charts/organizr/2.0.0/.helmignore
diff --git a/charts/organizr/1.6.4/Chart.yaml b/charts/organizr/2.0.0/Chart.yaml
similarity index 75%
rename from charts/organizr/1.6.4/Chart.yaml
rename to charts/organizr/2.0.0/Chart.yaml
index b5f27753c5a..1527f60f47c 100644
--- a/charts/organizr/1.6.4/Chart.yaml
+++ b/charts/organizr/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: organizr
+<<<<<<< HEAD:charts/organizr/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/organizr/2.0.0/Chart.yaml
 upstream_version: 3.2.1
 appVersion: latest
 description: HTPC/Homelab Services Organizer
@@ -19,7 +23,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/organizr/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/organizr/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/organizr/1.6.4/README.md b/charts/organizr/2.0.0/README.md
similarity index 76%
rename from charts/organizr/1.6.4/README.md
rename to charts/organizr/2.0.0/README.md
index e275b41eac4..3e4c65ce946 100644
--- a/charts/organizr/1.6.4/README.md
+++ b/charts/organizr/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/organizr/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/organizr/2.0.0/README.md
 
 HTPC/Homelab Services Organizer
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/organizr/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/organizr/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/organizr/1.6.4/app-readme.md b/charts/organizr/2.0.0/app-readme.md
similarity index 96%
rename from charts/organizr/1.6.4/app-readme.md
rename to charts/organizr/2.0.0/app-readme.md
index 90cbb51afcf..5387fa8b65c 100644
--- a/charts/organizr/1.6.4/app-readme.md
+++ b/charts/organizr/2.0.0/app-readme.md
@@ -1,2 +1 @@
 HTPC/Homelab Services Organizer
-
diff --git a/charts/organizr/2.0.0/charts/common-2.0.0.tgz b/charts/organizr/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/organizr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/organizr/1.6.4/docs/CONFIG.md b/charts/organizr/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/organizr/1.6.4/docs/CONFIG.md
rename to charts/organizr/2.0.0/docs/CONFIG.md
diff --git a/charts/ombi/1.6.4/docs/CONFIG.md.gotmpl b/charts/organizr/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/ombi/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/organizr/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/organizr/1.6.4/questions.yaml b/charts/organizr/2.0.0/questions.yaml
similarity index 86%
rename from charts/organizr/1.6.4/questions.yaml
rename to charts/organizr/2.0.0/questions.yaml
index 5914dd5b9d9..1ae6fdf9787 100644
--- a/charts/organizr/1.6.4/questions.yaml
+++ b/charts/organizr/2.0.0/questions.yaml
@@ -113,37 +113,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 80
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/ombi/1.6.4/templates/common.yaml b/charts/organizr/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/ombi/1.6.4/templates/common.yaml
rename to charts/organizr/2.0.0/templates/common.yaml
diff --git a/charts/organizr/1.6.4/test_values.yaml b/charts/organizr/2.0.0/test_values.yaml
similarity index 90%
rename from charts/organizr/1.6.4/test_values.yaml
rename to charts/organizr/2.0.0/test_values.yaml
index 0b9961fbf0a..965b7a63223 100644
--- a/charts/organizr/1.6.4/test_values.yaml
+++ b/charts/organizr/2.0.0/test_values.yaml
@@ -9,9 +9,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ: UTC
diff --git a/charts/organizr/1.6.4/values.yaml b/charts/organizr/2.0.0/values.yaml
similarity index 90%
rename from charts/organizr/1.6.4/values.yaml
rename to charts/organizr/2.0.0/values.yaml
index 2410b8c7efe..4b5ce5c6a0d 100644
--- a/charts/organizr/1.6.4/values.yaml
+++ b/charts/organizr/2.0.0/values.yaml
@@ -9,9 +9,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ: UTC
diff --git a/charts/qbittorrent/1.6.4/Chart.lock b/charts/qbittorrent/1.6.4/Chart.lock
deleted file mode 100644
index 5436013da05..00000000000
--- a/charts/qbittorrent/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:17.402526464Z"
diff --git a/charts/qbittorrent/1.6.4/charts/common-1.6.7.tgz b/charts/qbittorrent/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/qbittorrent/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/qbittorrent/1.6.4/.helmignore b/charts/qbittorrent/2.0.0/.helmignore
similarity index 100%
rename from charts/qbittorrent/1.6.4/.helmignore
rename to charts/qbittorrent/2.0.0/.helmignore
diff --git a/charts/qbittorrent/1.6.4/Chart.yaml b/charts/qbittorrent/2.0.0/Chart.yaml
similarity index 75%
rename from charts/qbittorrent/1.6.4/Chart.yaml
rename to charts/qbittorrent/2.0.0/Chart.yaml
index c676840e663..c7f15380b2b 100644
--- a/charts/qbittorrent/1.6.4/Chart.yaml
+++ b/charts/qbittorrent/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: qbittorrent
+<<<<<<< HEAD:charts/qbittorrent/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/qbittorrent/2.0.0/Chart.yaml
 upstream_version: 7.2.1
 appVersion: 4.3.0
 description: qBittorrent is a cross-platform free and open-source BitTorrent client
@@ -19,7 +23,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/qbittorrent/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/qbittorrent/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/qbittorrent/1.6.4/README.md b/charts/qbittorrent/2.0.0/README.md
similarity index 76%
rename from charts/qbittorrent/1.6.4/README.md
rename to charts/qbittorrent/2.0.0/README.md
index 5b2877aecb5..4706f869e7f 100644
--- a/charts/qbittorrent/1.6.4/README.md
+++ b/charts/qbittorrent/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/qbittorrent/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/qbittorrent/2.0.0/README.md
 
 qBittorrent is a cross-platform free and open-source BitTorrent client
 
@@ -21,7 +25,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/qbittorrent/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/qbittorrent/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/qbittorrent/1.6.4/app-readme.md b/charts/qbittorrent/2.0.0/app-readme.md
similarity index 98%
rename from charts/qbittorrent/1.6.4/app-readme.md
rename to charts/qbittorrent/2.0.0/app-readme.md
index ee674b0ddd3..b1762c311ed 100644
--- a/charts/qbittorrent/1.6.4/app-readme.md
+++ b/charts/qbittorrent/2.0.0/app-readme.md
@@ -1,2 +1 @@
 qBittorrent is a cross-platform free and open-source BitTorrent client
-
diff --git a/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz b/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/qbittorrent/1.6.4/docs/CONFIG.md b/charts/qbittorrent/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/qbittorrent/1.6.4/docs/CONFIG.md
rename to charts/qbittorrent/2.0.0/docs/CONFIG.md
diff --git a/charts/organizr/1.6.4/docs/CONFIG.md.gotmpl b/charts/qbittorrent/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/organizr/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/qbittorrent/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/qbittorrent/1.6.4/questions.yaml b/charts/qbittorrent/2.0.0/questions.yaml
similarity index 83%
rename from charts/qbittorrent/1.6.4/questions.yaml
rename to charts/qbittorrent/2.0.0/questions.yaml
index 57fb73e270e..e4c7702c57c 100644
--- a/charts/qbittorrent/1.6.4/questions.yaml
+++ b/charts/qbittorrent/2.0.0/questions.yaml
@@ -111,69 +111,94 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8787
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8787
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
                         default: 36052
                         required: true
-
-
-  - variable: appAdditionalServices
-    group: "Networking"
-    label: "Configure additional services"
-    schema:
-      type: dict
-      attrs:
         - variable: tcp
-          label: ""
+          label: "TCP Torrent connections"
+          description: "This service is used to process incomming torrent connections over TCP"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable TCP port for Torrent Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -182,18 +207,17 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "torrent-tcp"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "TCP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -202,38 +226,41 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 51413
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 51413
-                        required: false
+                        default: 36052
+                        required: true
         - variable: udp
-          label: ""
+          label: "UDP Torrent connections"
+          description: "This service is used to process incomming torrent connections over UDP"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable UDP port for Torrent Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -242,18 +269,17 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "torrent-udp"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "UDP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -262,22 +288,21 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 51413
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 51413
-                        required: false
-
-
+                        default: 36052
+                        required: true
 
   # Enable Host Network
   - variable: hostNetwork
diff --git a/charts/nzbhydra/1.6.4/templates/NOTES.txt b/charts/qbittorrent/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/nzbhydra/1.6.4/templates/NOTES.txt
rename to charts/qbittorrent/2.0.0/templates/NOTES.txt
diff --git a/charts/organizr/1.6.4/templates/common.yaml b/charts/qbittorrent/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/organizr/1.6.4/templates/common.yaml
rename to charts/qbittorrent/2.0.0/templates/common.yaml
diff --git a/charts/qbittorrent/1.6.4/templates/configmap.yaml b/charts/qbittorrent/2.0.0/templates/configmap.yaml
similarity index 86%
rename from charts/qbittorrent/1.6.4/templates/configmap.yaml
rename to charts/qbittorrent/2.0.0/templates/configmap.yaml
index ced7963d6cb..f8549d96fc0 100644
--- a/charts/qbittorrent/1.6.4/templates/configmap.yaml
+++ b/charts/qbittorrent/2.0.0/templates/configmap.yaml
@@ -23,13 +23,8 @@ metadata:
   labels:
     {{- include "common.labels" . | nindent 4 }}
 data:
-  {{- /* Determine if the bittorrent port is set somewhere */ -}}
   {{- $bittorrentPort := "" -}}
-  {{- range $extraServices := .Values.service.additionalServices }}
-    {{- if and .enabled (eq "bittorrent" .nameSuffix) -}}
-      {{- $bittorrentPort = .port.port -}}
-    {{- end }}
-  {{- end }}
+  {{- $bittorrentPort = .Values.services.tcp.port.port -}}
   {{- if $bittorrentPort }}
   31-update-port: |-
     #!/bin/bash
diff --git a/charts/qbittorrent/1.6.4/test_values.yaml b/charts/qbittorrent/2.0.0/test_values.yaml
similarity index 96%
rename from charts/qbittorrent/1.6.4/test_values.yaml
rename to charts/qbittorrent/2.0.0/test_values.yaml
index 8f5a0e56581..dd1a38197d2 100644
--- a/charts/qbittorrent/1.6.4/test_values.yaml
+++ b/charts/qbittorrent/2.0.0/test_values.yaml
@@ -14,9 +14,25 @@ env: {}
   # PGID: 1001
   # UMASK: 022
 
-service:
-  port:
-    port: 8080
+services:
+  main:
+    port:
+      port: 8080
+  tcp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51413
+      protocol: TCP
+      targetPort: 51413
+  udp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51413
+      protocol: UDP
+      targetPort: 51413
+
 
 persistence:
   config:
@@ -92,19 +108,3 @@ appVolumeMounts:
 
 appAdditionalServicesEnabled: true
 appAdditionalServices:
-  tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-tcp
-      protocol: TCP
-      targetPort: 51413
-  udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-udp
-      protocol: UDP
-      targetPort: 51413
diff --git a/charts/qbittorrent/1.6.4/values.yaml b/charts/qbittorrent/2.0.0/values.yaml
similarity index 87%
rename from charts/qbittorrent/1.6.4/values.yaml
rename to charts/qbittorrent/2.0.0/values.yaml
index a5628fb83ad..4b522444214 100644
--- a/charts/qbittorrent/1.6.4/values.yaml
+++ b/charts/qbittorrent/2.0.0/values.yaml
@@ -14,9 +14,26 @@ env: {}
   # PGID: 1001
   # UMASK: 022
 
-service:
-  port:
-    port: 8080
+services:
+  main:
+    port:
+      port: 8080
+#  tcp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 51413
+#      name: bittorrent-tcp
+#      protocol: TCP
+#      targetPort: 51413
+#  udp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 51413
+#      name: bittorrent-udp
+#      protocol: UDP
+#      targetPort: 51413
 
 persistence:
   config:
diff --git a/charts/radarr/1.6.4/Chart.lock b/charts/radarr/1.6.4/Chart.lock
deleted file mode 100644
index cf3a62fc4b9..00000000000
--- a/charts/radarr/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:14.696592049Z"
diff --git a/charts/radarr/1.6.4/charts/common-1.6.7.tgz b/charts/radarr/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/radarr/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/radarr/1.6.4/.helmignore b/charts/radarr/2.0.0/.helmignore
similarity index 100%
rename from charts/radarr/1.6.4/.helmignore
rename to charts/radarr/2.0.0/.helmignore
diff --git a/charts/radarr/1.6.4/Chart.yaml b/charts/radarr/2.0.0/Chart.yaml
similarity index 77%
rename from charts/radarr/1.6.4/Chart.yaml
rename to charts/radarr/2.0.0/Chart.yaml
index d8f6f79d679..902007b4518 100644
--- a/charts/radarr/1.6.4/Chart.yaml
+++ b/charts/radarr/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: radarr
+<<<<<<< HEAD:charts/radarr/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/radarr/2.0.0/Chart.yaml
 upstream_version: 9.1.0
 appVersion: "version-3.0.0.3989"
 description: A fork of Sonarr to work with movies à la Couchpotato
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/radarr/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/radarr/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/radarr/1.6.4/README.md b/charts/radarr/2.0.0/README.md
similarity index 76%
rename from charts/radarr/1.6.4/README.md
rename to charts/radarr/2.0.0/README.md
index 75ede61cae5..84616fad29e 100644
--- a/charts/radarr/1.6.4/README.md
+++ b/charts/radarr/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/radarr/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: version-3.0.0.3989](https://img.shields.io/badge/AppVersion-version--3.0.0.3989-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: version-3.0.0.3989](https://img.shields.io/badge/AppVersion-version--3.0.0.3989-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/radarr/2.0.0/README.md
 
 A fork of Sonarr to work with movies à la Couchpotato
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/radarr/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/radarr/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/radarr/1.6.4/app-readme.md b/charts/radarr/2.0.0/app-readme.md
similarity index 98%
rename from charts/radarr/1.6.4/app-readme.md
rename to charts/radarr/2.0.0/app-readme.md
index 7002a7da2fd..cd4de02205e 100644
--- a/charts/radarr/1.6.4/app-readme.md
+++ b/charts/radarr/2.0.0/app-readme.md
@@ -1,2 +1 @@
 A fork of Sonarr to work with movies à la Couchpotato
-
diff --git a/charts/radarr/2.0.0/charts/common-2.0.0.tgz b/charts/radarr/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/radarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/radarr/1.6.4/docs/CONFIG.md b/charts/radarr/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/radarr/1.6.4/docs/CONFIG.md
rename to charts/radarr/2.0.0/docs/CONFIG.md
diff --git a/charts/qbittorrent/1.6.4/docs/CONFIG.md.gotmpl b/charts/radarr/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/qbittorrent/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/radarr/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/radarr/1.6.4/questions.yaml b/charts/radarr/2.0.0/questions.yaml
similarity index 88%
rename from charts/radarr/1.6.4/questions.yaml
rename to charts/radarr/2.0.0/questions.yaml
index c32f62a4904..08edc30bb26 100644
--- a/charts/radarr/1.6.4/questions.yaml
+++ b/charts/radarr/2.0.0/questions.yaml
@@ -113,37 +113,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 7878
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 7878
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/qbittorrent/1.6.4/templates/common.yaml b/charts/radarr/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/qbittorrent/1.6.4/templates/common.yaml
rename to charts/radarr/2.0.0/templates/common.yaml
diff --git a/charts/radarr/1.6.4/test_values.yaml b/charts/radarr/2.0.0/test_values.yaml
similarity index 97%
rename from charts/radarr/1.6.4/test_values.yaml
rename to charts/radarr/2.0.0/test_values.yaml
index 89bcf722522..e5b218bc040 100644
--- a/charts/radarr/1.6.4/test_values.yaml
+++ b/charts/radarr/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 7878
+services:
+  main:
+    port:
+      port: 7878
 
 env: {}
   # TZ: UTC
diff --git a/charts/radarr/1.6.4/values.yaml b/charts/radarr/2.0.0/values.yaml
similarity index 97%
rename from charts/radarr/1.6.4/values.yaml
rename to charts/radarr/2.0.0/values.yaml
index 1e2801d6638..62fac492450 100644
--- a/charts/radarr/1.6.4/values.yaml
+++ b/charts/radarr/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 7878
+services:
+  main:
+    port:
+      port: 7878
 
 env: {}
   # TZ: UTC
diff --git a/charts/readarr/1.6.4/Chart.lock b/charts/readarr/1.6.4/Chart.lock
deleted file mode 100644
index a4ab64e4e43..00000000000
--- a/charts/readarr/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:12.005706307Z"
diff --git a/charts/readarr/1.6.4/charts/common-1.6.7.tgz b/charts/readarr/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/readarr/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/readarr/1.6.4/.helmignore b/charts/readarr/2.0.0/.helmignore
similarity index 100%
rename from charts/readarr/1.6.4/.helmignore
rename to charts/readarr/2.0.0/.helmignore
diff --git a/charts/readarr/1.6.4/Chart.yaml b/charts/readarr/2.0.0/Chart.yaml
similarity index 77%
rename from charts/readarr/1.6.4/Chart.yaml
rename to charts/readarr/2.0.0/Chart.yaml
index 23a9720010e..467bdd8283a 100644
--- a/charts/readarr/1.6.4/Chart.yaml
+++ b/charts/readarr/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: readarr
+<<<<<<< HEAD:charts/readarr/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/readarr/2.0.0/Chart.yaml
 upstream_version: 2.1.0
 appversion: "nightly"
 description: A fork of Radarr to work with Books & AudioBooks
@@ -23,7 +27,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/readarr/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/readarr/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/readarr/1.6.4/README.md b/charts/readarr/2.0.0/README.md
similarity index 79%
rename from charts/readarr/1.6.4/README.md
rename to charts/readarr/2.0.0/README.md
index eb87958e024..835e437f9ad 100644
--- a/charts/readarr/1.6.4/README.md
+++ b/charts/readarr/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/readarr/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/readarr/2.0.0/README.md
 
 A fork of Radarr to work with Books & AudioBooks
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/readarr/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/readarr/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/readarr/1.6.4/app-readme.md b/charts/readarr/2.0.0/app-readme.md
similarity index 98%
rename from charts/readarr/1.6.4/app-readme.md
rename to charts/readarr/2.0.0/app-readme.md
index fc8343ecfb4..2e1c8dce90d 100644
--- a/charts/readarr/1.6.4/app-readme.md
+++ b/charts/readarr/2.0.0/app-readme.md
@@ -1,2 +1 @@
 A fork of Radarr to work with Books & AudioBooks
-
diff --git a/charts/readarr/2.0.0/charts/common-2.0.0.tgz b/charts/readarr/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/readarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/readarr/1.6.4/docs/CONFIG.md b/charts/readarr/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/readarr/1.6.4/docs/CONFIG.md
rename to charts/readarr/2.0.0/docs/CONFIG.md
diff --git a/charts/radarr/1.6.4/docs/CONFIG.md.gotmpl b/charts/readarr/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/radarr/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/readarr/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/readarr/1.6.4/questions.yaml b/charts/readarr/2.0.0/questions.yaml
similarity index 88%
rename from charts/readarr/1.6.4/questions.yaml
rename to charts/readarr/2.0.0/questions.yaml
index 73346552cae..6ca6c9154e2 100644
--- a/charts/readarr/1.6.4/questions.yaml
+++ b/charts/readarr/2.0.0/questions.yaml
@@ -112,37 +112,68 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8787
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8787
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/qbittorrent/1.6.4/templates/NOTES.txt b/charts/readarr/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/qbittorrent/1.6.4/templates/NOTES.txt
rename to charts/readarr/2.0.0/templates/NOTES.txt
diff --git a/charts/radarr/1.6.4/templates/common.yaml b/charts/readarr/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/radarr/1.6.4/templates/common.yaml
rename to charts/readarr/2.0.0/templates/common.yaml
diff --git a/charts/readarr/1.6.4/test_values.yaml b/charts/readarr/2.0.0/test_values.yaml
similarity index 97%
rename from charts/readarr/1.6.4/test_values.yaml
rename to charts/readarr/2.0.0/test_values.yaml
index 2b6c549ac42..15969443449 100644
--- a/charts/readarr/1.6.4/test_values.yaml
+++ b/charts/readarr/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8787
+services:
+  main:
+    port:
+      port: 8787
 
 env: {}
   # TZ: UTC
diff --git a/charts/readarr/1.6.4/values.yaml b/charts/readarr/2.0.0/values.yaml
similarity index 97%
rename from charts/readarr/1.6.4/values.yaml
rename to charts/readarr/2.0.0/values.yaml
index 4f208513b99..3b933e3cbc0 100644
--- a/charts/readarr/1.6.4/values.yaml
+++ b/charts/readarr/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8787
+services:
+  main:
+    port:
+      port: 8787
 
 env: {}
   # TZ: UTC
diff --git a/charts/sabnzbd/1.6.4/Chart.lock b/charts/sabnzbd/1.6.4/Chart.lock
deleted file mode 100644
index 1788d5a364d..00000000000
--- a/charts/sabnzbd/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:09.299519955Z"
diff --git a/charts/sabnzbd/1.6.4/charts/common-1.6.7.tgz b/charts/sabnzbd/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/sabnzbd/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/sabnzbd/1.6.4/.helmignore b/charts/sabnzbd/2.0.0/.helmignore
similarity index 100%
rename from charts/sabnzbd/1.6.4/.helmignore
rename to charts/sabnzbd/2.0.0/.helmignore
diff --git a/charts/sabnzbd/1.6.4/Chart.yaml b/charts/sabnzbd/2.0.0/Chart.yaml
similarity index 75%
rename from charts/sabnzbd/1.6.4/Chart.yaml
rename to charts/sabnzbd/2.0.0/Chart.yaml
index 41c7b54dc59..0f2c68c87f8 100644
--- a/charts/sabnzbd/1.6.4/Chart.yaml
+++ b/charts/sabnzbd/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: sabnzbd
+<<<<<<< HEAD:charts/sabnzbd/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/sabnzbd/2.0.0/Chart.yaml
 upstream_version: 5.0.1
 appVersion: 3.1.0
 description: Free and easy binary newsreader
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/sabnzbd/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/sabnzbd/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/sabnzbd/1.6.4/README.md b/charts/sabnzbd/2.0.0/README.md
similarity index 76%
rename from charts/sabnzbd/1.6.4/README.md
rename to charts/sabnzbd/2.0.0/README.md
index c747b2925df..fa2d52e4e52 100644
--- a/charts/sabnzbd/1.6.4/README.md
+++ b/charts/sabnzbd/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/sabnzbd/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/sabnzbd/2.0.0/README.md
 
 Free and easy binary newsreader
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/sabnzbd/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/sabnzbd/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/sabnzbd/1.6.4/app-readme.md b/charts/sabnzbd/2.0.0/app-readme.md
similarity index 96%
rename from charts/sabnzbd/1.6.4/app-readme.md
rename to charts/sabnzbd/2.0.0/app-readme.md
index 537f2facd99..7aeb93dbf44 100644
--- a/charts/sabnzbd/1.6.4/app-readme.md
+++ b/charts/sabnzbd/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Free and easy binary newsreader
-
diff --git a/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz b/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/sabnzbd/1.6.4/docs/CONFIG.md b/charts/sabnzbd/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/sabnzbd/1.6.4/docs/CONFIG.md
rename to charts/sabnzbd/2.0.0/docs/CONFIG.md
diff --git a/charts/readarr/1.6.4/docs/CONFIG.md.gotmpl b/charts/sabnzbd/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/readarr/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/sabnzbd/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/sabnzbd/1.6.4/questions.yaml b/charts/sabnzbd/2.0.0/questions.yaml
similarity index 86%
rename from charts/sabnzbd/1.6.4/questions.yaml
rename to charts/sabnzbd/2.0.0/questions.yaml
index 8c9e6c7ad55..a673b387a74 100644
--- a/charts/sabnzbd/1.6.4/questions.yaml
+++ b/charts/sabnzbd/2.0.0/questions.yaml
@@ -121,37 +121,68 @@ questions:
       type: boolean
       default: false
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8080
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8080
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/readarr/1.6.4/templates/NOTES.txt b/charts/sabnzbd/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/readarr/1.6.4/templates/NOTES.txt
rename to charts/sabnzbd/2.0.0/templates/NOTES.txt
diff --git a/charts/readarr/1.6.4/templates/common.yaml b/charts/sabnzbd/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/readarr/1.6.4/templates/common.yaml
rename to charts/sabnzbd/2.0.0/templates/common.yaml
diff --git a/charts/sabnzbd/1.6.4/test_values.yaml b/charts/sabnzbd/2.0.0/test_values.yaml
similarity index 96%
rename from charts/sabnzbd/1.6.4/test_values.yaml
rename to charts/sabnzbd/2.0.0/test_values.yaml
index 133cc706e37..7d9b4d70bb7 100644
--- a/charts/sabnzbd/1.6.4/test_values.yaml
+++ b/charts/sabnzbd/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8080
+services:
+  main:
+    port:
+      port: 8080
 
 env: {}
   # TZ: UTC
diff --git a/charts/sabnzbd/1.6.4/values.yaml b/charts/sabnzbd/2.0.0/values.yaml
similarity index 95%
rename from charts/sabnzbd/1.6.4/values.yaml
rename to charts/sabnzbd/2.0.0/values.yaml
index 71d72ab4578..e79f57f827e 100644
--- a/charts/sabnzbd/1.6.4/values.yaml
+++ b/charts/sabnzbd/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8080
+services:
+  main:
+    port:
+      port: 8080
 
 env: {}
   # TZ: UTC
diff --git a/charts/sonarr/1.6.4/Chart.lock b/charts/sonarr/1.6.4/Chart.lock
deleted file mode 100644
index 8dcfab040ef..00000000000
--- a/charts/sonarr/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:06.594511124Z"
diff --git a/charts/sonarr/1.6.4/charts/common-1.6.7.tgz b/charts/sonarr/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/sonarr/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/sonarr/1.6.4/.helmignore b/charts/sonarr/2.0.0/.helmignore
similarity index 100%
rename from charts/sonarr/1.6.4/.helmignore
rename to charts/sonarr/2.0.0/.helmignore
diff --git a/charts/sonarr/1.6.4/Chart.yaml b/charts/sonarr/2.0.0/Chart.yaml
similarity index 77%
rename from charts/sonarr/1.6.4/Chart.yaml
rename to charts/sonarr/2.0.0/Chart.yaml
index 6ea5985e0cc..edb710aa2e3 100644
--- a/charts/sonarr/1.6.4/Chart.yaml
+++ b/charts/sonarr/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: sonarr
+<<<<<<< HEAD:charts/sonarr/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/sonarr/2.0.0/Chart.yaml
 upstream_version: 9.1.0
 appVersion: "version-3.0.4.993"
 description: Smart PVR for newsgroup and bittorrent users
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/sonarr/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/sonarr/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/sonarr/1.6.4/README.md b/charts/sonarr/2.0.0/README.md
similarity index 76%
rename from charts/sonarr/1.6.4/README.md
rename to charts/sonarr/2.0.0/README.md
index fec61a352f6..6701f18eb89 100644
--- a/charts/sonarr/1.6.4/README.md
+++ b/charts/sonarr/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/sonarr/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: version-3.0.4.993](https://img.shields.io/badge/AppVersion-version--3.0.4.993-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: version-3.0.4.993](https://img.shields.io/badge/AppVersion-version--3.0.4.993-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/sonarr/2.0.0/README.md
 
 Smart PVR for newsgroup and bittorrent users
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/sonarr/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/sonarr/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/sonarr/1.6.4/app-readme.md b/charts/sonarr/2.0.0/app-readme.md
similarity index 97%
rename from charts/sonarr/1.6.4/app-readme.md
rename to charts/sonarr/2.0.0/app-readme.md
index 034ec996703..d6133765df9 100644
--- a/charts/sonarr/1.6.4/app-readme.md
+++ b/charts/sonarr/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Smart PVR for newsgroup and bittorrent users
-
diff --git a/charts/sonarr/2.0.0/charts/common-2.0.0.tgz b/charts/sonarr/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/sonarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/sonarr/1.6.4/docs/CONFIG.md b/charts/sonarr/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/sonarr/1.6.4/docs/CONFIG.md
rename to charts/sonarr/2.0.0/docs/CONFIG.md
diff --git a/charts/sabnzbd/1.6.4/docs/CONFIG.md.gotmpl b/charts/sonarr/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/sabnzbd/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/sonarr/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/sonarr/1.6.4/questions.yaml b/charts/sonarr/2.0.0/questions.yaml
similarity index 88%
rename from charts/sonarr/1.6.4/questions.yaml
rename to charts/sonarr/2.0.0/questions.yaml
index 8da38cf3a08..2524cb8787c 100644
--- a/charts/sonarr/1.6.4/questions.yaml
+++ b/charts/sonarr/2.0.0/questions.yaml
@@ -122,37 +122,68 @@ questions:
       type: boolean
       default: false
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8989
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8989
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/sabnzbd/1.6.4/templates/common.yaml b/charts/sonarr/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/sabnzbd/1.6.4/templates/common.yaml
rename to charts/sonarr/2.0.0/templates/common.yaml
diff --git a/charts/sonarr/1.6.4/test_values.yaml b/charts/sonarr/2.0.0/test_values.yaml
similarity index 97%
rename from charts/sonarr/1.6.4/test_values.yaml
rename to charts/sonarr/2.0.0/test_values.yaml
index cf5f67f97f8..2112ccdc2ef 100644
--- a/charts/sonarr/1.6.4/test_values.yaml
+++ b/charts/sonarr/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8989
+services:
+  main:
+    port:
+      port: 8989
 
 env: {}
   # TZ: UTC
diff --git a/charts/sonarr/1.6.4/values.yaml b/charts/sonarr/2.0.0/values.yaml
similarity index 98%
rename from charts/sonarr/1.6.4/values.yaml
rename to charts/sonarr/2.0.0/values.yaml
index 216ee9dea11..5163b4b2b2c 100644
--- a/charts/sonarr/1.6.4/values.yaml
+++ b/charts/sonarr/2.0.0/values.yaml
@@ -8,8 +8,9 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
+services:
+  main:
+    port:
     port: 8989
 
 env: {}
diff --git a/charts/tautulli/1.6.4/Chart.lock b/charts/tautulli/1.6.4/Chart.lock
deleted file mode 100644
index d92b860685b..00000000000
--- a/charts/tautulli/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:33:03.798145174Z"
diff --git a/charts/tautulli/1.6.4/charts/common-1.6.7.tgz b/charts/tautulli/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/tautulli/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/tautulli/1.6.4/.helmignore b/charts/tautulli/2.0.0/.helmignore
similarity index 100%
rename from charts/tautulli/1.6.4/.helmignore
rename to charts/tautulli/2.0.0/.helmignore
diff --git a/charts/tautulli/1.6.4/Chart.yaml b/charts/tautulli/2.0.0/Chart.yaml
similarity index 77%
rename from charts/tautulli/1.6.4/Chart.yaml
rename to charts/tautulli/2.0.0/Chart.yaml
index 7f7b5cc4c57..a765af87224 100644
--- a/charts/tautulli/1.6.4/Chart.yaml
+++ b/charts/tautulli/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: tautulli
+<<<<<<< HEAD:charts/tautulli/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/tautulli/2.0.0/Chart.yaml
 upstream_version: 7.0.1
 appVersion: "v2.6.6"
 description: A Python based monitoring and tracking tool for Plex Media Server
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/tautulli/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/tautulli/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/tautulli/1.6.4/README.md b/charts/tautulli/2.0.0/README.md
similarity index 77%
rename from charts/tautulli/1.6.4/README.md
rename to charts/tautulli/2.0.0/README.md
index 4a24509dc44..d64bf2a143b 100644
--- a/charts/tautulli/1.6.4/README.md
+++ b/charts/tautulli/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/tautulli/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.6](https://img.shields.io/badge/AppVersion-v2.6.6-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.6](https://img.shields.io/badge/AppVersion-v2.6.6-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/tautulli/2.0.0/README.md
 
 A Python based monitoring and tracking tool for Plex Media Server
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/tautulli/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/tautulli/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/tautulli/1.6.4/app-readme.md b/charts/tautulli/2.0.0/app-readme.md
similarity index 98%
rename from charts/tautulli/1.6.4/app-readme.md
rename to charts/tautulli/2.0.0/app-readme.md
index 0f332028468..bdf83079fb2 100644
--- a/charts/tautulli/1.6.4/app-readme.md
+++ b/charts/tautulli/2.0.0/app-readme.md
@@ -1,2 +1 @@
 A Python based monitoring and tracking tool for Plex Media Server
-
diff --git a/charts/tautulli/2.0.0/charts/common-2.0.0.tgz b/charts/tautulli/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/tautulli/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/tautulli/1.6.4/docs/CONFIG.md b/charts/tautulli/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/tautulli/1.6.4/docs/CONFIG.md
rename to charts/tautulli/2.0.0/docs/CONFIG.md
diff --git a/charts/sonarr/1.6.4/docs/CONFIG.md.gotmpl b/charts/tautulli/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/sonarr/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/tautulli/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/tautulli/1.6.4/questions.yaml b/charts/tautulli/2.0.0/questions.yaml
similarity index 84%
rename from charts/tautulli/1.6.4/questions.yaml
rename to charts/tautulli/2.0.0/questions.yaml
index 08855723887..f49d5e70edb 100644
--- a/charts/tautulli/1.6.4/questions.yaml
+++ b/charts/tautulli/2.0.0/questions.yaml
@@ -122,37 +122,68 @@ questions:
       type: boolean
       default: false
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8181
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8181
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/sonarr/1.6.4/templates/common.yaml b/charts/tautulli/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/sonarr/1.6.4/templates/common.yaml
rename to charts/tautulli/2.0.0/templates/common.yaml
diff --git a/charts/tautulli/1.6.4/test_values.yaml b/charts/tautulli/2.0.0/test_values.yaml
similarity index 90%
rename from charts/tautulli/1.6.4/test_values.yaml
rename to charts/tautulli/2.0.0/test_values.yaml
index 00c68e5201a..57336e7306d 100644
--- a/charts/tautulli/1.6.4/test_values.yaml
+++ b/charts/tautulli/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8181
+services:
+  main:
+    port:
+      port: 8181
 
 env: {}
   # TZ: UTC
diff --git a/charts/tautulli/1.6.4/values.yaml b/charts/tautulli/2.0.0/values.yaml
similarity index 88%
rename from charts/tautulli/1.6.4/values.yaml
rename to charts/tautulli/2.0.0/values.yaml
index dc3853d6e6c..f99e7d1d640 100644
--- a/charts/tautulli/1.6.4/values.yaml
+++ b/charts/tautulli/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8181
+services:
+  main:
+    port:
+      port: 8181
 
 env: {}
   # TZ: UTC
diff --git a/charts/traefik/1.3.5/Chart.lock b/charts/traefik/1.3.5/Chart.lock
deleted file mode 100644
index 0aec2a62df3..00000000000
--- a/charts/traefik/1.3.5/Chart.lock
+++ /dev/null
@@ -1,12 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-- name: cert-manager
-  repository: https://charts.jetstack.io
-  version: v1.2.0
-- name: reflector
-  repository: https://emberstack.github.io/helm-charts
-  version: 5.4.17
-digest: sha256:52f7fd3acf117d0d78742b75cff0329bd49746fac421ee1234d4ba9c5bc7c695
-generated: "2021-03-09T20:32:59.031608062Z"
diff --git a/charts/traefik/1.3.5/charts/common-1.6.7.tgz b/charts/traefik/1.3.5/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/traefik/1.3.5/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/traefik/1.3.5/.helmignore b/charts/traefik/2.0.0/.helmignore
similarity index 100%
rename from charts/traefik/1.3.5/.helmignore
rename to charts/traefik/2.0.0/.helmignore
diff --git a/charts/traefik/1.3.5/Chart.yaml b/charts/traefik/2.0.0/Chart.yaml
similarity index 80%
rename from charts/traefik/1.3.5/Chart.yaml
rename to charts/traefik/2.0.0/Chart.yaml
index 4b1d90e8507..a7d0a26d258 100644
--- a/charts/traefik/1.3.5/Chart.yaml
+++ b/charts/traefik/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: traefik
+<<<<<<< HEAD:charts/traefik/1.3.5/Chart.yaml
 version: 1.3.5
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/traefik/2.0.0/Chart.yaml
 upstream_version: 9.14.2
 appVersion: 2.4.2
 description: A Traefik based Reverse Proxy and Certificate Manager
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/traefik/1.3.5/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/traefik/2.0.0/Chart.yaml
   - name: cert-manager
     repository:  "https://charts.jetstack.io"
     version: v1.2.0
diff --git a/charts/traefik/1.3.5/Guidelines.md b/charts/traefik/2.0.0/Guidelines.md
similarity index 100%
rename from charts/traefik/1.3.5/Guidelines.md
rename to charts/traefik/2.0.0/Guidelines.md
diff --git a/charts/traefik/1.3.5/LICENSE b/charts/traefik/2.0.0/LICENSE
similarity index 100%
rename from charts/traefik/1.3.5/LICENSE
rename to charts/traefik/2.0.0/LICENSE
diff --git a/charts/traefik/1.3.5/README.md b/charts/traefik/2.0.0/README.md
similarity index 77%
rename from charts/traefik/1.3.5/README.md
rename to charts/traefik/2.0.0/README.md
index fd63aeda404..b626c567a65 100644
--- a/charts/traefik/1.3.5/README.md
+++ b/charts/traefik/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/traefik/1.3.5/README.md
 ![Version: 1.3.5](https://img.shields.io/badge/Version-1.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square)
+=======
+![Version: 1.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/traefik/2.0.0/README.md
 
 A Traefik based Reverse Proxy and Certificate Manager
 
@@ -23,7 +27,11 @@ Kubernetes: `>=1.16.0-0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.jetstack.io | cert-manager | v1.2.0 |
+<<<<<<< HEAD:charts/traefik/1.3.5/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/traefik/2.0.0/README.md
 | https://emberstack.github.io/helm-charts | reflector | 5.4.17 |
 
 ## Installing the Chart
diff --git a/charts/traefik/1.3.5/app-readme.md b/charts/traefik/2.0.0/app-readme.md
similarity index 98%
rename from charts/traefik/1.3.5/app-readme.md
rename to charts/traefik/2.0.0/app-readme.md
index a0eee9b953a..e9f33caacb9 100644
--- a/charts/traefik/1.3.5/app-readme.md
+++ b/charts/traefik/2.0.0/app-readme.md
@@ -1,2 +1 @@
 A Traefik based Reverse Proxy and Certificate Manager
-
diff --git a/charts/traefik/1.3.5/charts/cert-manager-v1.2.0.tgz b/charts/traefik/2.0.0/charts/cert-manager-v1.2.0.tgz
similarity index 100%
rename from charts/traefik/1.3.5/charts/cert-manager-v1.2.0.tgz
rename to charts/traefik/2.0.0/charts/cert-manager-v1.2.0.tgz
diff --git a/charts/traefik/2.0.0/charts/common-2.0.0.tgz b/charts/traefik/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/traefik/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/traefik/1.3.5/charts/reflector-5.4.17.tgz b/charts/traefik/2.0.0/charts/reflector-5.4.17.tgz
similarity index 100%
rename from charts/traefik/1.3.5/charts/reflector-5.4.17.tgz
rename to charts/traefik/2.0.0/charts/reflector-5.4.17.tgz
diff --git a/charts/traefik/1.3.5/crds/ingressroute.yaml b/charts/traefik/2.0.0/crds/ingressroute.yaml
similarity index 100%
rename from charts/traefik/1.3.5/crds/ingressroute.yaml
rename to charts/traefik/2.0.0/crds/ingressroute.yaml
diff --git a/charts/traefik/1.3.5/crds/ingressroutetcp.yaml b/charts/traefik/2.0.0/crds/ingressroutetcp.yaml
similarity index 100%
rename from charts/traefik/1.3.5/crds/ingressroutetcp.yaml
rename to charts/traefik/2.0.0/crds/ingressroutetcp.yaml
diff --git a/charts/traefik/1.3.5/crds/ingressrouteudp.yaml b/charts/traefik/2.0.0/crds/ingressrouteudp.yaml
similarity index 100%
rename from charts/traefik/1.3.5/crds/ingressrouteudp.yaml
rename to charts/traefik/2.0.0/crds/ingressrouteudp.yaml
diff --git a/charts/traefik/1.3.5/crds/middlewares.yaml b/charts/traefik/2.0.0/crds/middlewares.yaml
similarity index 100%
rename from charts/traefik/1.3.5/crds/middlewares.yaml
rename to charts/traefik/2.0.0/crds/middlewares.yaml
diff --git a/charts/traefik/1.3.5/crds/serverstransports.yaml b/charts/traefik/2.0.0/crds/serverstransports.yaml
similarity index 100%
rename from charts/traefik/1.3.5/crds/serverstransports.yaml
rename to charts/traefik/2.0.0/crds/serverstransports.yaml
diff --git a/charts/traefik/1.3.5/crds/tlsoptions.yaml b/charts/traefik/2.0.0/crds/tlsoptions.yaml
similarity index 100%
rename from charts/traefik/1.3.5/crds/tlsoptions.yaml
rename to charts/traefik/2.0.0/crds/tlsoptions.yaml
diff --git a/charts/traefik/1.3.5/crds/tlsstores.yaml b/charts/traefik/2.0.0/crds/tlsstores.yaml
similarity index 100%
rename from charts/traefik/1.3.5/crds/tlsstores.yaml
rename to charts/traefik/2.0.0/crds/tlsstores.yaml
diff --git a/charts/traefik/1.3.5/crds/traefikservices.yaml b/charts/traefik/2.0.0/crds/traefikservices.yaml
similarity index 100%
rename from charts/traefik/1.3.5/crds/traefikservices.yaml
rename to charts/traefik/2.0.0/crds/traefikservices.yaml
diff --git a/charts/traefik/1.3.5/docs/CONFIG.md b/charts/traefik/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/traefik/1.3.5/docs/CONFIG.md
rename to charts/traefik/2.0.0/docs/CONFIG.md
diff --git a/charts/tautulli/1.6.4/docs/CONFIG.md.gotmpl b/charts/traefik/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/tautulli/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/traefik/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/traefik/1.3.5/questions.yaml b/charts/traefik/2.0.0/questions.yaml
similarity index 100%
rename from charts/traefik/1.3.5/questions.yaml
rename to charts/traefik/2.0.0/questions.yaml
diff --git a/charts/traefik/1.3.5/templates/_helpers.tpl b/charts/traefik/2.0.0/templates/_helpers.tpl
similarity index 100%
rename from charts/traefik/1.3.5/templates/_helpers.tpl
rename to charts/traefik/2.0.0/templates/_helpers.tpl
diff --git a/charts/traefik/1.3.5/templates/_podtemplate.tpl b/charts/traefik/2.0.0/templates/_podtemplate.tpl
similarity index 100%
rename from charts/traefik/1.3.5/templates/_podtemplate.tpl
rename to charts/traefik/2.0.0/templates/_podtemplate.tpl
diff --git a/charts/traefik/1.3.5/templates/custom/_appStorage.tpl b/charts/traefik/2.0.0/templates/custom/_appStorage.tpl
similarity index 100%
rename from charts/traefik/1.3.5/templates/custom/_appStorage.tpl
rename to charts/traefik/2.0.0/templates/custom/_appStorage.tpl
diff --git a/charts/traefik/1.3.5/templates/custom/appingress.yaml b/charts/traefik/2.0.0/templates/custom/appingress.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/custom/appingress.yaml
rename to charts/traefik/2.0.0/templates/custom/appingress.yaml
diff --git a/charts/traefik/1.3.5/templates/custom/clusterissuer.yaml b/charts/traefik/2.0.0/templates/custom/clusterissuer.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/custom/clusterissuer.yaml
rename to charts/traefik/2.0.0/templates/custom/clusterissuer.yaml
diff --git a/charts/traefik/1.3.5/templates/custom/delay_postinstall.yaml b/charts/traefik/2.0.0/templates/custom/delay_postinstall.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/custom/delay_postinstall.yaml
rename to charts/traefik/2.0.0/templates/custom/delay_postinstall.yaml
diff --git a/charts/traefik/1.3.5/templates/custom/middlewares.yaml b/charts/traefik/2.0.0/templates/custom/middlewares.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/custom/middlewares.yaml
rename to charts/traefik/2.0.0/templates/custom/middlewares.yaml
diff --git a/charts/traefik/1.3.5/templates/custom/tlsoptions.yaml b/charts/traefik/2.0.0/templates/custom/tlsoptions.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/custom/tlsoptions.yaml
rename to charts/traefik/2.0.0/templates/custom/tlsoptions.yaml
diff --git a/charts/traefik/1.3.5/templates/custom/wildcard.yaml b/charts/traefik/2.0.0/templates/custom/wildcard.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/custom/wildcard.yaml
rename to charts/traefik/2.0.0/templates/custom/wildcard.yaml
diff --git a/charts/traefik/1.3.5/templates/daemonset.yaml b/charts/traefik/2.0.0/templates/daemonset.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/daemonset.yaml
rename to charts/traefik/2.0.0/templates/daemonset.yaml
diff --git a/charts/traefik/1.3.5/templates/dashboard-hook-ingressroute.yaml b/charts/traefik/2.0.0/templates/dashboard-hook-ingressroute.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/dashboard-hook-ingressroute.yaml
rename to charts/traefik/2.0.0/templates/dashboard-hook-ingressroute.yaml
diff --git a/charts/traefik/1.3.5/templates/deployment.yaml b/charts/traefik/2.0.0/templates/deployment.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/deployment.yaml
rename to charts/traefik/2.0.0/templates/deployment.yaml
diff --git a/charts/traefik/1.3.5/templates/gateway.yaml b/charts/traefik/2.0.0/templates/gateway.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/gateway.yaml
rename to charts/traefik/2.0.0/templates/gateway.yaml
diff --git a/charts/traefik/1.3.5/templates/gatewayclass.yaml b/charts/traefik/2.0.0/templates/gatewayclass.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/gatewayclass.yaml
rename to charts/traefik/2.0.0/templates/gatewayclass.yaml
diff --git a/charts/traefik/1.3.5/templates/hpa.yaml b/charts/traefik/2.0.0/templates/hpa.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/hpa.yaml
rename to charts/traefik/2.0.0/templates/hpa.yaml
diff --git a/charts/traefik/1.3.5/templates/ingressclass.yaml b/charts/traefik/2.0.0/templates/ingressclass.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/ingressclass.yaml
rename to charts/traefik/2.0.0/templates/ingressclass.yaml
diff --git a/charts/traefik/1.3.5/templates/poddisruptionbudget.yaml b/charts/traefik/2.0.0/templates/poddisruptionbudget.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/poddisruptionbudget.yaml
rename to charts/traefik/2.0.0/templates/poddisruptionbudget.yaml
diff --git a/charts/traefik/1.3.5/templates/pvc.yaml b/charts/traefik/2.0.0/templates/pvc.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/pvc.yaml
rename to charts/traefik/2.0.0/templates/pvc.yaml
diff --git a/charts/traefik/1.3.5/templates/rbac/clusterrole.yaml b/charts/traefik/2.0.0/templates/rbac/clusterrole.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/rbac/clusterrole.yaml
rename to charts/traefik/2.0.0/templates/rbac/clusterrole.yaml
diff --git a/charts/traefik/1.3.5/templates/rbac/clusterrolebinding.yaml b/charts/traefik/2.0.0/templates/rbac/clusterrolebinding.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/rbac/clusterrolebinding.yaml
rename to charts/traefik/2.0.0/templates/rbac/clusterrolebinding.yaml
diff --git a/charts/traefik/1.3.5/templates/rbac/podsecuritypolicy.yaml b/charts/traefik/2.0.0/templates/rbac/podsecuritypolicy.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/rbac/podsecuritypolicy.yaml
rename to charts/traefik/2.0.0/templates/rbac/podsecuritypolicy.yaml
diff --git a/charts/traefik/1.3.5/templates/rbac/role.yaml b/charts/traefik/2.0.0/templates/rbac/role.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/rbac/role.yaml
rename to charts/traefik/2.0.0/templates/rbac/role.yaml
diff --git a/charts/traefik/1.3.5/templates/rbac/rolebinding.yaml b/charts/traefik/2.0.0/templates/rbac/rolebinding.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/rbac/rolebinding.yaml
rename to charts/traefik/2.0.0/templates/rbac/rolebinding.yaml
diff --git a/charts/traefik/1.3.5/templates/rbac/serviceaccount.yaml b/charts/traefik/2.0.0/templates/rbac/serviceaccount.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/rbac/serviceaccount.yaml
rename to charts/traefik/2.0.0/templates/rbac/serviceaccount.yaml
diff --git a/charts/traefik/1.3.5/templates/service.yaml b/charts/traefik/2.0.0/templates/service.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/service.yaml
rename to charts/traefik/2.0.0/templates/service.yaml
diff --git a/charts/traefik/1.3.5/templates/tlsoption.yaml b/charts/traefik/2.0.0/templates/tlsoption.yaml
similarity index 100%
rename from charts/traefik/1.3.5/templates/tlsoption.yaml
rename to charts/traefik/2.0.0/templates/tlsoption.yaml
diff --git a/charts/traefik/1.3.5/test_values.yaml b/charts/traefik/2.0.0/test_values.yaml
similarity index 100%
rename from charts/traefik/1.3.5/test_values.yaml
rename to charts/traefik/2.0.0/test_values.yaml
diff --git a/charts/traefik/1.3.5/values.yaml b/charts/traefik/2.0.0/values.yaml
similarity index 100%
rename from charts/traefik/1.3.5/values.yaml
rename to charts/traefik/2.0.0/values.yaml
diff --git a/charts/transmission/1.6.4/Chart.lock b/charts/transmission/1.6.4/Chart.lock
deleted file mode 100644
index b9c3e14c605..00000000000
--- a/charts/transmission/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:32:55.635826661Z"
diff --git a/charts/transmission/1.6.4/charts/common-1.6.7.tgz b/charts/transmission/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/transmission/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/transmission/1.6.4/.helmignore b/charts/transmission/2.0.0/.helmignore
similarity index 100%
rename from charts/transmission/1.6.4/.helmignore
rename to charts/transmission/2.0.0/.helmignore
diff --git a/charts/transmission/1.6.4/Chart.yaml b/charts/transmission/2.0.0/Chart.yaml
similarity index 76%
rename from charts/transmission/1.6.4/Chart.yaml
rename to charts/transmission/2.0.0/Chart.yaml
index f72f041107e..7f002002066 100644
--- a/charts/transmission/1.6.4/Chart.yaml
+++ b/charts/transmission/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: transmission
+<<<<<<< HEAD:charts/transmission/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/transmission/2.0.0/Chart.yaml
 # upstream_version:
 appVersion: "version-v0.17.153"
 description: API Support for your favorite torrent trackers.
@@ -20,7 +24,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/transmission/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/transmission/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/transmission/1.6.4/README.md b/charts/transmission/2.0.0/README.md
similarity index 75%
rename from charts/transmission/1.6.4/README.md
rename to charts/transmission/2.0.0/README.md
index 4ab0d3b9985..36f3366bacb 100644
--- a/charts/transmission/1.6.4/README.md
+++ b/charts/transmission/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/transmission/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: version-v0.17.153](https://img.shields.io/badge/AppVersion-version--v0.17.153-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: version-v0.17.153](https://img.shields.io/badge/AppVersion-version--v0.17.153-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/transmission/2.0.0/README.md
 
 API Support for your favorite torrent trackers.
 
@@ -21,7 +25,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/transmission/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/transmission/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/transmission/1.6.4/app-readme.md b/charts/transmission/2.0.0/app-readme.md
similarity index 97%
rename from charts/transmission/1.6.4/app-readme.md
rename to charts/transmission/2.0.0/app-readme.md
index 6b9a1be91d3..0114ba37abe 100644
--- a/charts/transmission/1.6.4/app-readme.md
+++ b/charts/transmission/2.0.0/app-readme.md
@@ -1,2 +1 @@
 API Support for your favorite torrent trackers.
-
diff --git a/charts/transmission/2.0.0/charts/common-2.0.0.tgz b/charts/transmission/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/transmission/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/transmission/1.6.4/docs/CONFIG.md b/charts/transmission/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/transmission/1.6.4/docs/CONFIG.md
rename to charts/transmission/2.0.0/docs/CONFIG.md
diff --git a/charts/traefik/1.3.5/docs/CONFIG.md.gotmpl b/charts/transmission/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/traefik/1.3.5/docs/CONFIG.md.gotmpl
rename to charts/transmission/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/transmission/1.6.4/questions.yaml b/charts/transmission/2.0.0/questions.yaml
similarity index 83%
rename from charts/transmission/1.6.4/questions.yaml
rename to charts/transmission/2.0.0/questions.yaml
index 0167fa149d8..a05cf9e0464 100644
--- a/charts/transmission/1.6.4/questions.yaml
+++ b/charts/transmission/2.0.0/questions.yaml
@@ -121,68 +121,94 @@ questions:
       type: boolean
       default: false
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 9091
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 9091
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
                         default: 36052
                         required: true
-
-  - variable: appAdditionalServices
-    group: "Networking"
-    label: "Configure additional services"
-    schema:
-      type: dict
-      attrs:
         - variable: tcp
-          label: ""
+          label: "TCP Torrent connections"
+          description: "This service is used to process incomming torrent connections over TCP"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable TCP port for Torrent Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -191,18 +217,17 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "torrent-tcp"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "TCP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -211,38 +236,41 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 51413
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 51413
-                        required: false
+                        default: 36052
+                        required: true
         - variable: udp
-          label: ""
+          label: "UDP Torrent connections"
+          description: "This service is used to process incomming torrent connections over UDP"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable UDP port for Torrent Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -251,18 +279,17 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "torrent-udp"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "UDP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -271,20 +298,21 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 51413
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 51413
-                        required: false
+                        default: 36052
+                        required: true
 
 ## TrueCharts Specific
 
diff --git a/charts/tautulli/1.6.4/templates/common.yaml b/charts/transmission/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/tautulli/1.6.4/templates/common.yaml
rename to charts/transmission/2.0.0/templates/common.yaml
diff --git a/charts/transmission/1.6.4/test_values.yaml b/charts/transmission/2.0.0/test_values.yaml
similarity index 90%
rename from charts/transmission/1.6.4/test_values.yaml
rename to charts/transmission/2.0.0/test_values.yaml
index 4113beba049..0f123f4aae9 100644
--- a/charts/transmission/1.6.4/test_values.yaml
+++ b/charts/transmission/2.0.0/test_values.yaml
@@ -8,9 +8,24 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 9091
+services:
+  main:
+    port:
+      port: 9091
+  tcp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51413
+      protocol: TCP
+      targetPort: 51413
+  udp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51413
+      protocol: UDP
+      targetPort: 51413
 
 
 env: {}
@@ -59,23 +74,3 @@ appVolumeMounts:
     emptyDir: true
     setPermissions: true
     mountPath: "/downloads"
-
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-tcp
-      protocol: TCP
-      targetPort: 51413
-  udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-udp
-      protocol: UDP
-      targetPort: 51413
diff --git a/charts/transmission/1.6.4/values.yaml b/charts/transmission/2.0.0/values.yaml
similarity index 54%
rename from charts/transmission/1.6.4/values.yaml
rename to charts/transmission/2.0.0/values.yaml
index 9932e5834c1..ffc0a3d5139 100644
--- a/charts/transmission/1.6.4/values.yaml
+++ b/charts/transmission/2.0.0/values.yaml
@@ -8,9 +8,26 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 9091
+services:
+  main:
+    port:
+      port: 9091
+#  tcp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 51413
+#      protocol: TCP
+#      targetPort: 51413
+#      nodePort: 51413
+#  udp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 51413
+#      protocol: UDP
+#      targetPort: 51413
+#      nodePort: 51413
 
 env: {}
   # TZ: UTC
@@ -36,25 +53,3 @@ persistence:
 #    enabled: true
 #    emptyDir: false
 #    datasetName: "downloads"
-
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-tcp
-      protocol: TCP
-      targetPort: 51413
-      nodePort: 51413
-  udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51413
-      name: bittorrent-udp
-      protocol: UDP
-      targetPort: 51413
-      nodePort: 51413
diff --git a/charts/truecommand/1.6.4/Chart.lock b/charts/truecommand/1.6.4/Chart.lock
deleted file mode 100644
index cc4edd058bc..00000000000
--- a/charts/truecommand/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:32:52.89582008Z"
diff --git a/charts/truecommand/1.6.4/charts/common-1.6.7.tgz b/charts/truecommand/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/truecommand/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/truecommand/1.6.4/.helmignore b/charts/truecommand/2.0.0/.helmignore
similarity index 100%
rename from charts/truecommand/1.6.4/.helmignore
rename to charts/truecommand/2.0.0/.helmignore
diff --git a/charts/truecommand/1.6.4/Chart.yaml b/charts/truecommand/2.0.0/Chart.yaml
similarity index 74%
rename from charts/truecommand/1.6.4/Chart.yaml
rename to charts/truecommand/2.0.0/Chart.yaml
index 0632d3ab558..59ed7eab064 100644
--- a/charts/truecommand/1.6.4/Chart.yaml
+++ b/charts/truecommand/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: truecommand
+<<<<<<< HEAD:charts/truecommand/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/truecommand/2.0.0/Chart.yaml
 # upstream_version: 1.1.0
 appVersion: 1.3.2
 description: Aggregated management of TrueNAS devices
@@ -17,7 +21,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/truecommand/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/truecommand/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/truecommand/1.6.4/README.md b/charts/truecommand/2.0.0/README.md
similarity index 75%
rename from charts/truecommand/1.6.4/README.md
rename to charts/truecommand/2.0.0/README.md
index a0704273a29..a6f0db74834 100644
--- a/charts/truecommand/1.6.4/README.md
+++ b/charts/truecommand/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/truecommand/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.2](https://img.shields.io/badge/AppVersion-1.3.2-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.2](https://img.shields.io/badge/AppVersion-1.3.2-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/truecommand/2.0.0/README.md
 
 Aggregated management of TrueNAS devices
 
@@ -20,7 +24,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/truecommand/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/truecommand/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/truecommand/1.6.4/app-readme.md b/charts/truecommand/2.0.0/app-readme.md
similarity index 97%
rename from charts/truecommand/1.6.4/app-readme.md
rename to charts/truecommand/2.0.0/app-readme.md
index 595aa6f9b47..6216899e9e7 100644
--- a/charts/truecommand/1.6.4/app-readme.md
+++ b/charts/truecommand/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Aggregated management of TrueNAS devices
-
diff --git a/charts/truecommand/2.0.0/charts/common-2.0.0.tgz b/charts/truecommand/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/truecommand/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/truecommand/1.6.4/docs/CONFIG.md b/charts/truecommand/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/truecommand/1.6.4/docs/CONFIG.md
rename to charts/truecommand/2.0.0/docs/CONFIG.md
diff --git a/charts/transmission/1.6.4/docs/CONFIG.md.gotmpl b/charts/truecommand/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/transmission/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/truecommand/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/truecommand/1.6.4/questions.yaml b/charts/truecommand/2.0.0/questions.yaml
similarity index 84%
rename from charts/truecommand/1.6.4/questions.yaml
rename to charts/truecommand/2.0.0/questions.yaml
index 520cd24769b..97eeacc706a 100644
--- a/charts/truecommand/1.6.4/questions.yaml
+++ b/charts/truecommand/2.0.0/questions.yaml
@@ -121,37 +121,68 @@ questions:
       type: boolean
       default: false
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 80
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 80
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
diff --git a/charts/truecommand/1.6.4/templates/NOTES.txt b/charts/truecommand/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/truecommand/1.6.4/templates/NOTES.txt
rename to charts/truecommand/2.0.0/templates/NOTES.txt
diff --git a/charts/transmission/1.6.4/templates/common.yaml b/charts/truecommand/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/transmission/1.6.4/templates/common.yaml
rename to charts/truecommand/2.0.0/templates/common.yaml
diff --git a/charts/truecommand/1.6.4/test_values.yaml b/charts/truecommand/2.0.0/test_values.yaml
similarity index 95%
rename from charts/truecommand/1.6.4/test_values.yaml
rename to charts/truecommand/2.0.0/test_values.yaml
index d0f99c518c9..93342033755 100644
--- a/charts/truecommand/1.6.4/test_values.yaml
+++ b/charts/truecommand/2.0.0/test_values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ: UTC
diff --git a/charts/truecommand/1.6.4/values.yaml b/charts/truecommand/2.0.0/values.yaml
similarity index 95%
rename from charts/truecommand/1.6.4/values.yaml
rename to charts/truecommand/2.0.0/values.yaml
index 08cb5210393..2314260d38e 100644
--- a/charts/truecommand/1.6.4/values.yaml
+++ b/charts/truecommand/2.0.0/values.yaml
@@ -8,9 +8,10 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 80
+services:
+  main:
+    port:
+      port: 80
 
 env: {}
   # TZ: UTC
diff --git a/charts/tvheadend/1.6.4/Chart.lock b/charts/tvheadend/1.6.4/Chart.lock
deleted file mode 100644
index 3528cb8106b..00000000000
--- a/charts/tvheadend/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:32:50.200768543Z"
diff --git a/charts/tvheadend/1.6.4/charts/common-1.6.7.tgz b/charts/tvheadend/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/tvheadend/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/tvheadend/1.6.4/templates/NOTES.txt b/charts/tvheadend/1.6.4/templates/NOTES.txt
deleted file mode 100644
index 90f7b653a50..00000000000
--- a/charts/tvheadend/1.6.4/templates/NOTES.txt
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "common.notes.defaultNotes" . -}}
diff --git a/charts/tvheadend/1.6.4/.helmignore b/charts/tvheadend/2.0.0/.helmignore
similarity index 100%
rename from charts/tvheadend/1.6.4/.helmignore
rename to charts/tvheadend/2.0.0/.helmignore
diff --git a/charts/tvheadend/1.6.4/Chart.yaml b/charts/tvheadend/2.0.0/Chart.yaml
similarity index 74%
rename from charts/tvheadend/1.6.4/Chart.yaml
rename to charts/tvheadend/2.0.0/Chart.yaml
index fa65ecb9bda..5eae703dde4 100644
--- a/charts/tvheadend/1.6.4/Chart.yaml
+++ b/charts/tvheadend/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: tvheadend
+<<<<<<< HEAD:charts/tvheadend/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/tvheadend/2.0.0/Chart.yaml
 upstream_version: 1.1.2
 appVersion: "latest"
 description: TVheadend - a TV streaming server and digital video recorder
@@ -21,7 +25,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/tvheadend/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/tvheadend/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/tvheadend/1.6.4/README.md b/charts/tvheadend/2.0.0/README.md
similarity index 76%
rename from charts/tvheadend/1.6.4/README.md
rename to charts/tvheadend/2.0.0/README.md
index 30440d4fafa..22d1fd12bed 100644
--- a/charts/tvheadend/1.6.4/README.md
+++ b/charts/tvheadend/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/tvheadend/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/tvheadend/2.0.0/README.md
 
 TVheadend - a TV streaming server and digital video recorder
 
@@ -21,7 +25,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/tvheadend/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/tvheadend/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/tvheadend/1.6.4/app-readme.md b/charts/tvheadend/2.0.0/app-readme.md
similarity index 98%
rename from charts/tvheadend/1.6.4/app-readme.md
rename to charts/tvheadend/2.0.0/app-readme.md
index 26cefb52392..c3b5aec4ab4 100644
--- a/charts/tvheadend/1.6.4/app-readme.md
+++ b/charts/tvheadend/2.0.0/app-readme.md
@@ -1,2 +1 @@
 TVheadend - a TV streaming server and digital video recorder
-
diff --git a/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz b/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/tvheadend/1.6.4/docs/CONFIG.md b/charts/tvheadend/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/tvheadend/1.6.4/docs/CONFIG.md
rename to charts/tvheadend/2.0.0/docs/CONFIG.md
diff --git a/charts/truecommand/1.6.4/docs/CONFIG.md.gotmpl b/charts/tvheadend/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/truecommand/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/tvheadend/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/tvheadend/1.6.4/questions.yaml b/charts/tvheadend/2.0.0/questions.yaml
similarity index 83%
rename from charts/tvheadend/1.6.4/questions.yaml
rename to charts/tvheadend/2.0.0/questions.yaml
index 514911cce62..2a985203b92 100644
--- a/charts/tvheadend/1.6.4/questions.yaml
+++ b/charts/tvheadend/2.0.0/questions.yaml
@@ -111,70 +111,32 @@ questions:
       default: false
 
   # Service Configuration
-  - variable: service
-    group: "Services"
-    label: "Configure main service for the UI"
-    schema:
-      type: dict
-      attrs:
-        - variable: type
-          label: "Service type"
-          schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "ClusterIP"
-                description: "ClusterIP"
-              - value: "NodePort"
-                description: "NodePort"
-            show_subquestions_if: NodePort
-            subquestions:
-              - variable: port
-                label: "Port configuration"
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: port
-                      label: "container port"
-                      schema:
-                        type: int
-                        default: 9981
-                        hidden: true
-                        editable: false
-                    - variable: nodePort
-                      label: "Node Port to expose for UI"
-                      schema:
-                        type: int
-                        min: 9000
-                        max: 65535
-                        default: 38091
-                        required: true
-
-
-  - variable: appAdditionalServices
+  - variable: services
     group: "Networking"
-    label: "Configure additional services"
+    label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: htsp
-          label: ""
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable TCP port for HTSP Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -183,18 +145,78 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "htsp"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "TCP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
+                    - variable: port
+                      label: "container port"
+                      schema:
+                        type: int
+                        default: 9981
+                        editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 9981
+                        editable: true
+                    - variable: nodePort
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
+                      schema:
+                        type: int
+                        min: 9000
+                        max: 65535
+                        default: 36052
+                        required: true
+        - variable: htsp
+          label: "HTSP service"
+          description: "Service to connect to htsp"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+              - variable: port
+                label: "Port configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -203,20 +225,21 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 9982
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 9982
-                        required: false
+                        default: 36052
+                        required: true
 
   # Configure app volumes
   - variable: appVolumeMounts
diff --git a/charts/sabnzbd/1.6.4/templates/NOTES.txt b/charts/tvheadend/2.0.0/templates/NOTES.txt
similarity index 100%
rename from charts/sabnzbd/1.6.4/templates/NOTES.txt
rename to charts/tvheadend/2.0.0/templates/NOTES.txt
diff --git a/charts/truecommand/1.6.4/templates/common.yaml b/charts/tvheadend/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/truecommand/1.6.4/templates/common.yaml
rename to charts/tvheadend/2.0.0/templates/common.yaml
diff --git a/charts/tvheadend/1.6.4/test_values.yaml b/charts/tvheadend/2.0.0/test_values.yaml
similarity index 88%
rename from charts/tvheadend/1.6.4/test_values.yaml
rename to charts/tvheadend/2.0.0/test_values.yaml
index 29d390ee21f..b9924bff174 100644
--- a/charts/tvheadend/1.6.4/test_values.yaml
+++ b/charts/tvheadend/2.0.0/test_values.yaml
@@ -15,9 +15,17 @@ env: {}
   # TZ: Europe/London
   # RUN_OPTS: <run options here>
 
-service:
-  port:
-    port: 9981
+services:
+  main:
+    port:
+      port: 9981
+  htsp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 9982
+      protocol: TCP
+      targetPort: 9982
 
 persistence:
   config:
@@ -43,14 +51,3 @@ appVolumeMounts:
     emptyDir: true
     #setPermissions: true
     mountPath: "/recordings"
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  htsp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 9982
-      name: htsp
-      protocol: TCP
-      targetPort: 9982
diff --git a/charts/tvheadend/1.6.4/values.yaml b/charts/tvheadend/2.0.0/values.yaml
similarity index 75%
rename from charts/tvheadend/1.6.4/values.yaml
rename to charts/tvheadend/2.0.0/values.yaml
index 797e88be6af..6c3224895ea 100644
--- a/charts/tvheadend/1.6.4/values.yaml
+++ b/charts/tvheadend/2.0.0/values.yaml
@@ -15,9 +15,18 @@ env: {}
   # TZ: Europe/London
   # RUN_OPTS: <run options here>
 
-service:
-  port:
-    port: 9981
+services:
+  main:
+    port:
+      port: 9981
+#  htsp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 9982
+#      name: htsp
+#      protocol: TCP
+#      targetPort: 9982
 
 persistence:
   config:
@@ -39,14 +48,3 @@ appIngressEnabled: false
 #   recordings:
 #     enabled: false
 #     emptyDir: false
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  htsp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 9982
-      name: htsp
-      protocol: TCP
-      targetPort: 9982
diff --git a/charts/unifi/1.3.4/Chart.lock b/charts/unifi/1.3.4/Chart.lock
deleted file mode 100644
index ba61f6af3fb..00000000000
--- a/charts/unifi/1.3.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:32:47.547504958Z"
diff --git a/charts/unifi/1.3.4/charts/common-1.6.7.tgz b/charts/unifi/1.3.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/unifi/1.3.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/unifi/1.3.4/values.yaml b/charts/unifi/1.3.4/values.yaml
deleted file mode 100644
index 349888bc217..00000000000
--- a/charts/unifi/1.3.4/values.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Default values for Unifi.
-
-image:
-  repository: jacobalberty/unifi
-  tag: stable-6
-  pullPolicy: IfNotPresent
-
-strategy:
-  type: Recreate
-
-service:
-  port:
-    port: 8443
-
-env: {}
-  # TZ:
-  # PUID:
-  # PGID:
-
-persistence:
-  config:
-    enabled: false
-    emptyDir: false
-
-appIngressEnabled: true
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 8080
-      name: unificom
-      protocol: TCP
-      targetPort: 8080
-  udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 3478
-      name: stun-udp
-      protocol: UDP
-      targetPort: 3478
diff --git a/charts/unifi/1.3.4/.helmignore b/charts/unifi/2.0.0/.helmignore
similarity index 100%
rename from charts/unifi/1.3.4/.helmignore
rename to charts/unifi/2.0.0/.helmignore
diff --git a/charts/unifi/1.3.4/Chart.yaml b/charts/unifi/2.0.0/Chart.yaml
similarity index 75%
rename from charts/unifi/1.3.4/Chart.yaml
rename to charts/unifi/2.0.0/Chart.yaml
index 0bfffe14c09..f5a7ee78a8d 100644
--- a/charts/unifi/1.3.4/Chart.yaml
+++ b/charts/unifi/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: unifi
+<<<<<<< HEAD:charts/unifi/1.3.4/Chart.yaml
 version: 1.3.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/unifi/2.0.0/Chart.yaml
 upstream_version: 1.5.1
 appVersion: 5.14.23
 description: Ubiquiti Network's Unifi Controller
@@ -19,7 +23,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/unifi/1.3.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/unifi/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/unifi/1.3.4/README.md b/charts/unifi/2.0.0/README.md
similarity index 76%
rename from charts/unifi/1.3.4/README.md
rename to charts/unifi/2.0.0/README.md
index b8e4d006fcd..5763996408c 100644
--- a/charts/unifi/1.3.4/README.md
+++ b/charts/unifi/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/unifi/1.3.4/README.md
 ![Version: 1.3.4](https://img.shields.io/badge/Version-1.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.14.23](https://img.shields.io/badge/AppVersion-5.14.23-informational?style=flat-square)
+=======
+![Version: 1.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.14.23](https://img.shields.io/badge/AppVersion-5.14.23-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/unifi/2.0.0/README.md
 
 Ubiquiti Network's Unifi Controller
 
@@ -21,7 +25,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/unifi/1.3.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/unifi/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/unifi/1.3.4/app-readme.md b/charts/unifi/2.0.0/app-readme.md
similarity index 97%
rename from charts/unifi/1.3.4/app-readme.md
rename to charts/unifi/2.0.0/app-readme.md
index 85b798d43af..08642c3515e 100644
--- a/charts/unifi/1.3.4/app-readme.md
+++ b/charts/unifi/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Ubiquiti Network's Unifi Controller
-
diff --git a/charts/unifi/2.0.0/charts/common-2.0.0.tgz b/charts/unifi/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/unifi/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/unifi/1.3.4/docs/CONFIG.md b/charts/unifi/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/unifi/1.3.4/docs/CONFIG.md
rename to charts/unifi/2.0.0/docs/CONFIG.md
diff --git a/charts/tvheadend/1.6.4/docs/CONFIG.md.gotmpl b/charts/unifi/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/tvheadend/1.6.4/docs/CONFIG.md.gotmpl
rename to charts/unifi/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/unifi/1.3.4/questions.yaml b/charts/unifi/2.0.0/questions.yaml
similarity index 69%
rename from charts/unifi/1.3.4/questions.yaml
rename to charts/unifi/2.0.0/questions.yaml
index 9baf321e3bd..edf8a21caf0 100644
--- a/charts/unifi/1.3.4/questions.yaml
+++ b/charts/unifi/2.0.0/questions.yaml
@@ -111,116 +111,198 @@ questions:
                 schema:
                   type: string
 
-  - variable: service
+  - variable: services
     group: "Networking"
     label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: type
-          label: "Service type"
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
-            type: string
-            default: "ClusterIP"
-            enum:
-              - value: "NodePort"
-                description: "NodePort"
-              - value: "ClusterIP"
-                description: "ClusterIP"
-            show_subquestions_if: "NodePort"
-            subquestions:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
               - variable: port
                 label: "Port configuration"
                 schema:
                   type: dict
                   attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
                         type: int
                         default: 8443
                         editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8443
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose for UI"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 34309
+                        default: 36052
                         required: true
-
-  - variable: appAdditionalServices
-    group: "Networking"
-    label: "Configure additional services"
-    schema:
-      type: dict
-      attrs:
         - variable: tcp
-          label: ""
+          label: "Unifi Device Communications"
+          description: "This services is used for devices to communicate with the controller"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable TCP port for device and controller communications"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
-                  show_subquestions_if: true
-                  subquestions:
-                    - variable: port
-                      label: "Configuration"
-                      schema:
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "container port"
-                            schema:
-                              type: int
-                              default: 8080
-                              required: false
-                    - variable: type
-                      label: "service type"
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+              - variable: port
+                label: "Port configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: protocol
+                      label: "Port Type"
                       schema:
                         type: string
-                        default: "NodePort"
+                        default: "TCP"
+                        hidden: true
                         enum:
-                          - value: "ClusterIP"
-                            description: "ClusterIP"
-                          - value: "NodePort"
-                            description: "NodePort"
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
+                    - variable: port
+                      label: "container port"
+                      schema:
+                        type: int
+                        default: 8080
+                        editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8080
+                        editable: true
+                    - variable: nodePort
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
+                      schema:
+                        type: int
+                        min: 9000
+                        max: 65535
+                        default: 36052
+                        required: true
         - variable: udp
-          label: ""
+          label: "Stun Device Communications"
+          description: "This services is used for devices to communicate with the controller using STUN"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable UDP port for STUN Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
-                  show_subquestions_if: true
-                  subquestions:
-                    - variable: port
-                      label: "Configuration"
-                      schema:
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "container port"
-                            schema:
-                              type: int
-                              default: 3478
-                              required: false
-                    - variable: type
-                      label: "service type"
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+              - variable: port
+                label: "Port configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: protocol
+                      label: "Port Type"
                       schema:
                         type: string
-                        default: "NodePort"
+                        default: "UDP"
+                        hidden: true
                         enum:
-                          - value: "ClusterIP"
-                            description: "ClusterIP"
-                          - value: "NodePort"
-                            description: "NodePort"
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
+                    - variable: port
+                      label: "container port"
+                      schema:
+                        type: int
+                        default: 3478
+                        editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 3478
+                        editable: true
+                    - variable: nodePort
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
+                      schema:
+                        type: int
+                        min: 9000
+                        max: 65535
+                        default: 36052
+                        required: true
 
   # Enable Host Networking
   - variable: hostNetwork
diff --git a/charts/tvheadend/1.6.4/templates/common.yaml b/charts/unifi/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/tvheadend/1.6.4/templates/common.yaml
rename to charts/unifi/2.0.0/templates/common.yaml
diff --git a/charts/unifi/1.3.4/test_values.yaml b/charts/unifi/2.0.0/test_values.yaml
similarity index 82%
rename from charts/unifi/1.3.4/test_values.yaml
rename to charts/unifi/2.0.0/test_values.yaml
index f743bc29fcd..9b799afa066 100644
--- a/charts/unifi/1.3.4/test_values.yaml
+++ b/charts/unifi/2.0.0/test_values.yaml
@@ -8,9 +8,24 @@ image:
 strategy:
   type: Recreate
 
-service:
-  port:
-    port: 8443
+services:
+  main:
+    port:
+      port: 8443
+  tcp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 8080
+      protocol: TCP
+      targetPort: 8080
+  udp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 3478
+      protocol: UDP
+      targetPort: 3478
 
 env: {}
   # TZ:
@@ -24,24 +39,6 @@ persistence:
 
 appIngressEnabled: false
 
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 8080
-      name: unificom
-      protocol: TCP
-      targetPort: 8080
-  udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 3478
-      name: unifistun
-      protocol: UDP
-      targetPort: 3478
 
 appVolumeMounts:
   config:
diff --git a/charts/unifi/2.0.0/values.yaml b/charts/unifi/2.0.0/values.yaml
new file mode 100644
index 00000000000..4616d0f6544
--- /dev/null
+++ b/charts/unifi/2.0.0/values.yaml
@@ -0,0 +1,40 @@
+# Default values for Unifi.
+
+image:
+  repository: jacobalberty/unifi
+  tag: stable-6
+  pullPolicy: IfNotPresent
+
+strategy:
+  type: Recreate
+
+services:
+  main:
+    port:
+      port: 8443
+#  tcp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 8080
+#      protocol: TCP
+#      targetPort: 8080
+#  udp:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 3478
+#      protocol: UDP
+#      targetPort: 3478
+
+env: {}
+  # TZ:
+  # PUID:
+  # PGID:
+
+persistence:
+  config:
+    enabled: false
+    emptyDir: false
+
+appIngressEnabled: true
diff --git a/charts/zwavejs2mqtt/1.6.4/Chart.lock b/charts/zwavejs2mqtt/1.6.4/Chart.lock
deleted file mode 100644
index 69a2e74357f..00000000000
--- a/charts/zwavejs2mqtt/1.6.4/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://charts.truecharts.org/
-  version: 1.6.7
-digest: sha256:0a64f876c94732b644861a2da65f48bca5b507c99ffe3d341235d6f4b3bee2a1
-generated: "2021-03-09T20:32:44.477282758Z"
diff --git a/charts/zwavejs2mqtt/1.6.4/charts/common-1.6.7.tgz b/charts/zwavejs2mqtt/1.6.4/charts/common-1.6.7.tgz
deleted file mode 100644
index f372d2cf7ac..00000000000
Binary files a/charts/zwavejs2mqtt/1.6.4/charts/common-1.6.7.tgz and /dev/null differ
diff --git a/charts/zwavejs2mqtt/1.6.4/docs/CONFIG.md.gotmpl b/charts/zwavejs2mqtt/1.6.4/docs/CONFIG.md.gotmpl
deleted file mode 100644
index 0242e267803..00000000000
--- a/charts/zwavejs2mqtt/1.6.4/docs/CONFIG.md.gotmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- define "custom.custom.configuration.header" -}}
-# Configuration Options
-{{- end -}}
-
-{{- define "custom.custom.configuration" -}}
-{{ template "custom.custom.configuration.header" . }}
-
-N/A
-{{- end -}}
-
-{{ template "custom.custom.configuration" . }}
diff --git a/charts/zwavejs2mqtt/1.6.4/templates/common.yaml b/charts/zwavejs2mqtt/1.6.4/templates/common.yaml
deleted file mode 100644
index a6613c2ce21..00000000000
--- a/charts/zwavejs2mqtt/1.6.4/templates/common.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{ include "common.all" . }}
diff --git a/charts/zwavejs2mqtt/1.6.4/.helmignore b/charts/zwavejs2mqtt/2.0.0/.helmignore
similarity index 100%
rename from charts/zwavejs2mqtt/1.6.4/.helmignore
rename to charts/zwavejs2mqtt/2.0.0/.helmignore
diff --git a/charts/zwavejs2mqtt/1.6.4/Chart.yaml b/charts/zwavejs2mqtt/2.0.0/Chart.yaml
similarity index 77%
rename from charts/zwavejs2mqtt/1.6.4/Chart.yaml
rename to charts/zwavejs2mqtt/2.0.0/Chart.yaml
index 180abbb9b17..5772e4d2a5e 100644
--- a/charts/zwavejs2mqtt/1.6.4/Chart.yaml
+++ b/charts/zwavejs2mqtt/2.0.0/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: zwavejs2mqtt
+<<<<<<< HEAD:charts/zwavejs2mqtt/1.6.4/Chart.yaml
 version: 1.6.4
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/zwavejs2mqtt/2.0.0/Chart.yaml
 upstream_version: 1.1.0
 appVersion: 1.1.1
 description: Fully configurable Zwave to MQTT gateway and Control Panel using NodeJS and Vue
@@ -22,7 +26,11 @@ sources:
 dependencies:
   - name: common
     repository: https://charts.truecharts.org/
+<<<<<<< HEAD:charts/zwavejs2mqtt/1.6.4/Chart.yaml
     version: 1.6.7
+=======
+    version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212):charts/zwavejs2mqtt/2.0.0/Chart.yaml
     # condition:
     # tags:
     # import-values:
diff --git a/charts/zwavejs2mqtt/1.6.4/README.md b/charts/zwavejs2mqtt/2.0.0/README.md
similarity index 77%
rename from charts/zwavejs2mqtt/1.6.4/README.md
rename to charts/zwavejs2mqtt/2.0.0/README.md
index 232cc604e33..c485e988ddb 100644
--- a/charts/zwavejs2mqtt/1.6.4/README.md
+++ b/charts/zwavejs2mqtt/2.0.0/README.md
@@ -1,6 +1,10 @@
 # Introduction
 
+<<<<<<< HEAD:charts/zwavejs2mqtt/1.6.4/README.md
 ![Version: 1.6.4](https://img.shields.io/badge/Version-1.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
+=======
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
+>>>>>>> [Common] Refactor Services (#212):charts/zwavejs2mqtt/2.0.0/README.md
 
 Fully configurable Zwave to MQTT gateway and Control Panel using NodeJS and Vue
 
@@ -22,7 +26,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+<<<<<<< HEAD:charts/zwavejs2mqtt/1.6.4/README.md
 | https://charts.truecharts.org/ | common | 1.6.7 |
+=======
+| https://charts.truecharts.org/ | common | 1.6.1 |
+>>>>>>> [Common] Refactor Services (#212):charts/zwavejs2mqtt/2.0.0/README.md
 
 ## Installing the Chart
 
diff --git a/charts/zwavejs2mqtt/1.6.4/app-readme.md b/charts/zwavejs2mqtt/2.0.0/app-readme.md
similarity index 98%
rename from charts/zwavejs2mqtt/1.6.4/app-readme.md
rename to charts/zwavejs2mqtt/2.0.0/app-readme.md
index f8a07814e6d..20e55701f5e 100644
--- a/charts/zwavejs2mqtt/1.6.4/app-readme.md
+++ b/charts/zwavejs2mqtt/2.0.0/app-readme.md
@@ -1,2 +1 @@
 Fully configurable Zwave to MQTT gateway and Control Panel using NodeJS and Vue
-
diff --git a/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz b/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz
new file mode 100644
index 00000000000..6fb73265460
Binary files /dev/null and b/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/zwavejs2mqtt/1.6.4/docs/CONFIG.md b/charts/zwavejs2mqtt/2.0.0/docs/CONFIG.md
similarity index 100%
rename from charts/zwavejs2mqtt/1.6.4/docs/CONFIG.md
rename to charts/zwavejs2mqtt/2.0.0/docs/CONFIG.md
diff --git a/charts/unifi/1.3.4/docs/CONFIG.md.gotmpl b/charts/zwavejs2mqtt/2.0.0/docs/CONFIG.md.gotmpl
similarity index 100%
rename from charts/unifi/1.3.4/docs/CONFIG.md.gotmpl
rename to charts/zwavejs2mqtt/2.0.0/docs/CONFIG.md.gotmpl
diff --git a/charts/zwavejs2mqtt/1.6.4/questions.yaml b/charts/zwavejs2mqtt/2.0.0/questions.yaml
similarity index 82%
rename from charts/zwavejs2mqtt/1.6.4/questions.yaml
rename to charts/zwavejs2mqtt/2.0.0/questions.yaml
index 5fd8f910d25..915f4ba115b 100644
--- a/charts/zwavejs2mqtt/1.6.4/questions.yaml
+++ b/charts/zwavejs2mqtt/2.0.0/questions.yaml
@@ -111,70 +111,32 @@ questions:
       default: false
 
   # Service Configuration
-  - variable: service
-    group: "Services"
-    label: "Configure main service for the UI"
-    schema:
-      type: dict
-      attrs:
-        - variable: type
-          label: "Service type"
-          schema:
-            type: string
-            default: "NodePort"
-            enum:
-              - value: "ClusterIP"
-                description: "ClusterIP"
-              - value: "NodePort"
-                description: "NodePort"
-            show_subquestions_if: NodePort
-            subquestions:
-              - variable: port
-                label: "Port configuration"
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: port
-                      label: "container port"
-                      schema:
-                        type: int
-                        default: 8091
-                        hidden: true
-                        editable: false
-                    - variable: nodePort
-                      label: "Node Port to expose for UI"
-                      schema:
-                        type: int
-                        min: 9000
-                        max: 65535
-                        default: 38091
-                        required: true
-
-
-  - variable: appAdditionalServices
+  - variable: services
     group: "Networking"
-    label: "Configure additional services"
+    label: "Configure Service"
     schema:
       type: dict
       attrs:
-        - variable: ws
-          label: ""
+        - variable: main
+          label: "Main service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
             type: dict
             attrs:
               - variable: enabled
-                label: "Enable TCP port for websocket Connections"
+                label: "Enable the service"
                 schema:
                   type: boolean
                   default: true
                   hidden: true
               - variable: type
                 label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
                 schema:
                   type: string
                   default: "ClusterIP"
                   enum:
-                    - value: "NodePort"
+                    - value: "nodePort"
                       description: "NodePort"
                     - value: "ClusterIP"
                       description: "ClusterIP"
@@ -183,18 +145,79 @@ questions:
                 schema:
                   type: dict
                   attrs:
-                    - variable: name
-                      label: "port name"
-                      schema:
-                        type: string
-                        default: "ws"
-                        hidden: true
                     - variable: protocol
-                      label: "Protocol"
+                      label: "Port Type"
                       schema:
                         type: string
                         default: "TCP"
                         hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
+                    - variable: port
+                      label: "container port"
+                      schema:
+                        type: int
+                        default: 8091
+                        editable: false
+                        hidden: true
+                    - variable: targetport
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
+                      schema:
+                        type: int
+                        default: 8091
+                        editable: true
+                    - variable: nodePort
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
+                      schema:
+                        type: int
+                        min: 9000
+                        max: 65535
+                        default: 36052
+                        required: true
+        - variable: ws
+          label: "WebSocket service"
+          description: "This server is used to process WebSocket Connections"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
+                schema:
+                  type: string
+                  default: "ClusterIP"
+                  enum:
+                    - value: "nodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+              - variable: port
+                label: "Port configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: protocol
+                      label: "Port Type"
+                      schema:
+                        type: string
+                        default: "TCP"
+                        hidden: true
+                        enum:
+                          - value: TCP
+                            description: "TCP"
+                          - value: "UDP"
+                            description: "UDP"
                     - variable: port
                       label: "container port"
                       schema:
@@ -203,21 +226,21 @@ questions:
                         editable: false
                         hidden: true
                     - variable: targetport
-                      label: "container targetport"
+                      label: "Internal Service port"
+                      description: "When connecting internally to this App, you'll need this port"
                       schema:
                         type: int
                         default: 3000
-                        editable: false
-                        hidden: true
+                        editable: true
                     - variable: nodePort
-                      label: "Node Port to expose"
+                      label: "(optional) host nodePort to expose to"
+                      description: "only get used when nodePort is selected"
                       schema:
                         type: int
                         min: 9000
                         max: 65535
-                        default: 53000
-                        required: false
-
+                        default: 36052
+                        required: true
 
   # Configure app volumes
   - variable: appVolumeMounts
diff --git a/charts/unifi/1.3.4/templates/common.yaml b/charts/zwavejs2mqtt/2.0.0/templates/common.yaml
similarity index 100%
rename from charts/unifi/1.3.4/templates/common.yaml
rename to charts/zwavejs2mqtt/2.0.0/templates/common.yaml
diff --git a/charts/zwavejs2mqtt/1.6.4/test_values.yaml b/charts/zwavejs2mqtt/2.0.0/test_values.yaml
similarity index 96%
rename from charts/zwavejs2mqtt/1.6.4/test_values.yaml
rename to charts/zwavejs2mqtt/2.0.0/test_values.yaml
index 4d54103448d..94bdf9af4ab 100644
--- a/charts/zwavejs2mqtt/1.6.4/test_values.yaml
+++ b/charts/zwavejs2mqtt/2.0.0/test_values.yaml
@@ -59,9 +59,18 @@ probes:
     #   periodSeconds: 10
     #   timeoutSeconds: 10
 
-service:
-  port:
-    port: 8091
+services:
+  main:
+    port:
+      port: 8091
+  ws:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 3000
+      protocol: TCP
+      targetPort: 3000
+
 
 # Privileged may be required if USB controller is accessed directly through the host machine
 # securityContext:
@@ -115,14 +124,3 @@ appVolumeMounts:
     emptyDir: true
     setPermissions: true
     mountPath: "/config"
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  ws:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 3000
-      name: ws
-      protocol: TCP
-      targetPort: 3000
diff --git a/charts/zwavejs2mqtt/1.6.4/values.yaml b/charts/zwavejs2mqtt/2.0.0/values.yaml
similarity index 92%
rename from charts/zwavejs2mqtt/1.6.4/values.yaml
rename to charts/zwavejs2mqtt/2.0.0/values.yaml
index c859d84aee6..b54c89056bf 100644
--- a/charts/zwavejs2mqtt/1.6.4/values.yaml
+++ b/charts/zwavejs2mqtt/2.0.0/values.yaml
@@ -59,11 +59,18 @@ probes:
     #   periodSeconds: 10
     #   timeoutSeconds: 10
 
-service:
-  type: NodePort
-  port:
-    name: webui
-    port: 8091
+services:
+  main:
+    type: NodePort
+    port:
+      port: 8091
+#  ws:
+#    enabled: true
+#    type: ClusterIP
+#    port:
+#      port: 3000
+#      protocol: TCP
+#      targetPort: 3000
 
 # Privileged may be required if USB controller is accessed directly through the host machine
 # securityContext:
@@ -126,14 +133,3 @@ additionalVolumes: []
 #    mountPath: "/dev/ttyAMC0"
 #    hostPathEnabled: true
 #    hostPath: "/dev/ttyAMC0"
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  ws:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 3000
-      name: ws
-      protocol: TCP
-      targetPort: 3000
diff --git a/library/common-test/Chart.lock b/library/common-test/Chart.lock
new file mode 100644
index 00000000000..3a7ed7ea3e6
--- /dev/null
+++ b/library/common-test/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../common
+  version: 2.0.0
+digest: sha256:75e16cc10f894e04849b7fdc64f531a59cb08bb62c237effe552a3c04cf8c67e
+generated: "2021-03-02T20:48:38.608996Z"
diff --git a/library/common-test/Chart.yaml b/library/common-test/Chart.yaml
index a43743d92fe..3c0d4182ba2 100644
--- a/library/common-test/Chart.yaml
+++ b/library/common-test/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: common-test
-version: 1.4.1
+version: 2.0.0
 # upstream_version:
 # appVersion:
 description: Helper chart to test different use cases of the common library
diff --git a/library/common-test/ci/basic-values.yaml b/library/common-test/ci/basic-values.yaml
index 23e5b375933..29d769093e1 100644
--- a/library/common-test/ci/basic-values.yaml
+++ b/library/common-test/ci/basic-values.yaml
@@ -3,9 +3,26 @@ image:
   tag: latest
   pullPolicy: IfNotPresent
 
-service:
-  port:
-    port: 8080
+services:
+  main:
+    port:
+      port: 8080
+  extra-tcp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51414
+      name: tcp-test
+      protocol: TCP
+      targetPort: 51414
+  extra-udp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51414
+      name: udp-test
+      protocol: UDP
+      targetPort: 51414
 
 ingress:
   enabled: true
@@ -50,22 +67,3 @@ appExtraVolumeMounts:
     mountPath: "/extratest2"
     hostPathEnabled: true
     hostPath: "/tmp"
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  extra-tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51414
-      name: tcp-test
-      protocol: TCP
-      targetPort: 51414
-  extra-udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51414
-      name: udp-test
-      protocol: UDP
-      targetPort: 51414
diff --git a/library/common-test/ci/codeserver-values.yaml b/library/common-test/ci/codeserver-values.yaml
index 38af9e0c379..9e8f91f562b 100644
--- a/library/common-test/ci/codeserver-values.yaml
+++ b/library/common-test/ci/codeserver-values.yaml
@@ -3,9 +3,26 @@ image:
   tag: latest
   pullPolicy: IfNotPresent
 
-service:
-  port:
-    port: 8080
+services:
+  main:
+    port:
+      port: 8080
+  extra-tcp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51414
+      name: tcp-test
+      protocol: TCP
+      targetPort: 51414
+  extra-udp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 51414
+      name: udp-test
+      protocol: UDP
+      targetPort: 51414
 
 ingress:
   enabled: true
@@ -58,22 +75,3 @@ appExtraVolumeMounts:
     mountPath: "/extratest2"
     hostPathEnabled: true
     hostPath: "/tmp"
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  extra-tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51414
-      name: tcp-test
-      protocol: TCP
-      targetPort: 51414
-  extra-udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51414
-      name: udp-test
-      protocol: UDP
-      targetPort: 51414
diff --git a/library/common-test/values.yaml b/library/common-test/values.yaml
index fd0299069fd..513109ffd2c 100644
--- a/library/common-test/values.yaml
+++ b/library/common-test/values.yaml
@@ -3,9 +3,44 @@ image:
   tag: latest
   pullPolicy: IfNotPresent
 
-service:
-  port:
-    port: 8080
+services:
+  main:
+    port:
+      port: 8080
+  test2-tcp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 8081
+      name: tcp-test
+      protocol: TCP
+      targetPort: 8081
+  test2-udp:
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 8082
+      name: udp-test
+      protocol: UDP
+      targetPort: 8082
+
+additionalServices:
+  - name: test3-tcp
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 8083
+      name: tcp-test
+      protocol: TCP
+      targetPort: 8083
+  - name: test4-dp
+    enabled: true
+    type: ClusterIP
+    port:
+      port: 8084
+      name: udp-test
+      protocol: UDP
+      targetPort: 8084
 
 ingress:
   enabled: true
@@ -44,22 +79,3 @@ additionalAppVolumeMounts:
     mountPath: "/test4"
     hostPathEnabled: true
     hostPath: "/tmp"
-
-appAdditionalServicesEnabled: true
-appAdditionalServices:
-  extra-tcp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51414
-      name: tcp-test
-      protocol: TCP
-      targetPort: 51414
-  extra-udp:
-    enabled: true
-    type: ClusterIP
-    port:
-      port: 51414
-      name: udp-test
-      protocol: UDP
-      targetPort: 51414
diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml
index 2f3119e795a..bde0d8198b8 100644
--- a/library/common/Chart.yaml
+++ b/library/common/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: common
+<<<<<<< HEAD
 version: 1.6.7
+=======
+version: 2.0.0
+>>>>>>> [Common] Refactor Services (#212)
 # upstream_version: 3.0.1
 # appVersion:
 description: Function library for TrueCharts
diff --git a/library/common/templates/_all.tpl b/library/common/templates/_all.tpl
index b2f730a3ad0..458b4a83cad 100644
--- a/library/common/templates/_all.tpl
+++ b/library/common/templates/_all.tpl
@@ -38,9 +38,7 @@ Main entrypoint for the common library chart. It will render all underlying temp
   {{ else if eq .Values.controllerType "statefulset"  }}
     {{- include "common.statefulset" . | nindent 0 }}
   {{- end -}}
-  {{- print "---" | nindent 0 -}}
-  {{ include "common.service" . | nindent 0 }}
-  {{ include "common.appService" . | nindent 0 }}
+  {{ include "common.services" . | nindent 0 }}
   {{- print "---" | nindent 0 -}}
   {{ include "common.ingress" .  | nindent 0 }}
   {{- print "---" | nindent 0 -}}
diff --git a/library/common/templates/_ingress.tpl b/library/common/templates/_ingress.tpl
index 85a745add50..2e973ab9826 100644
--- a/library/common/templates/_ingress.tpl
+++ b/library/common/templates/_ingress.tpl
@@ -22,7 +22,7 @@ of the main Ingress and any additionalIngresses.
 */}}
 {{- define "common.ingress" -}}
   {{- if .Values.ingress.enabled -}}
-    {{- $svcPort := .Values.service.port.port -}}
+    {{- $svcPort := .Values.services.main.port.port -}}
 
     {{- /* Generate primary ingress */ -}}
     {{- $ingressValues := .Values.ingress -}}
diff --git a/library/common/templates/_notes.tpl b/library/common/templates/_notes.tpl
index 6b72c05312d..e687b54fe54 100644
--- a/library/common/templates/_notes.tpl
+++ b/library/common/templates/_notes.tpl
@@ -20,22 +20,22 @@ This file is considered to be modified by the TrueCharts Project.
 Default NOTES.txt content.
 */}}
 {{- define "common.notes.defaultNotes" -}}
-{{- $svcPort := .Values.service.port.port -}}
+{{- $svcPort := .Values.services.main.port.port -}}
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
 {{- range .Values.ingress.hosts }}
   http{{ if $.Values.ingress.tls }}s{{ end }}://{{- if .hostTpl }}{{ tpl .hostTpl $ }}{{ else }}{{ .host }}{{ end }}{{ (first .paths).path }}
 {{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
+{{- else if contains "NodePort" .Values.services.main.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.names.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
+{{- else if contains "LoadBalancer" .Values.services.main.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
            You can watch the status of by running 'kubectl get svc -w {{ include "common.names.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.names.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ $svcPort }}
-{{- else if contains "ClusterIP" .Values.service.type }}
+{{- else if contains "ClusterIP" .Values.services.main.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "common.names.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:{{ $svcPort }}
diff --git a/library/common/templates/_services.tpl b/library/common/templates/_services.tpl
new file mode 100644
index 00000000000..fd9d1cf0a11
--- /dev/null
+++ b/library/common/templates/_services.tpl
@@ -0,0 +1,38 @@
+{{/*
+Renders the Service objects required by the chart by returning a concatinated list
+of the main Service and any additionalServices.
+*/}}
+{{- define "common.services" -}}
+  {{- if .Values.services -}}
+	{{- /* Add dict of primary services */ -}}
+    {{- range $name, $service := .Values.services }}
+      {{- if or ( $service.enabled ) ( eq $name "main" ) -}}
+        {{- print ("---") | nindent 0 -}}
+        {{- print ("\n") | nindent 0 -}}
+        {{- $serviceValues := $service -}}
+		{{- /* Dont add name suffix for primary service named "main" */ -}}
+        {{- if or (not $serviceValues.nameSuffix) ( ne $name "main" ) -}}
+          {{- $_ := set $serviceValues "nameSuffix" $name -}}
+        {{ end -}}
+        {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}}
+        {{- include "common.classes.service" $ -}}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+
+
+  {{- if .Values.additionalServices -}}
+    {{- /* Generate additional services as required */ -}}
+    {{- range $index, $extraService := .Values.additionalServices }}
+      {{- if $extraService.enabled -}}
+        {{- print ("---") | nindent 0 -}}
+        {{- $serviceValues := $extraService -}}
+        {{- if not $serviceValues.nameSuffix -}}
+          {{- $_ := set $serviceValues "nameSuffix" $index -}}
+        {{ end -}}
+        {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}}
+        {{- include "common.classes.service" $ -}}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/library/common/templates/classes/_service.tpl b/library/common/templates/classes/_service.tpl
index 7f1243895a1..3f2f5f65179 100644
--- a/library/common/templates/classes/_service.tpl
+++ b/library/common/templates/classes/_service.tpl
@@ -21,7 +21,7 @@ This template serves as a blueprint for all Service objects that are created
 within the common library.
 */}}
 {{- define "common.classes.service" -}}
-{{- $values := .Values.service -}}
+{{- $values := .Values.services.main -}}
 {{- if hasKey . "ObjectValues" -}}
   {{- with .ObjectValues.service -}}
     {{- $values = . -}}
diff --git a/library/common/templates/classes/ingress/_appIngressHTTP.tpl b/library/common/templates/classes/ingress/_appIngressHTTP.tpl
index 7f60b10505d..31b2fa7f940 100644
--- a/library/common/templates/classes/ingress/_appIngressHTTP.tpl
+++ b/library/common/templates/classes/ingress/_appIngressHTTP.tpl
@@ -14,7 +14,7 @@ within the common library.
   {{- $IngressName = printf "%v-%v" $IngressName $values.nameSuffix -}}
 {{ end -}}
 {{- $svcName := $values.serviceName | default (include "common.names.fullname" .) -}}
-{{- $svcPort := $values.servicePort | default $.Values.service.port.port -}}
+{{- $svcPort := $values.servicePort | default $.Values.services.main.port.port -}}
 apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
diff --git a/library/common/templates/classes/ingress/_appIngressTCP.tpl b/library/common/templates/classes/ingress/_appIngressTCP.tpl
index 2ed8a834923..24025636d4e 100644
--- a/library/common/templates/classes/ingress/_appIngressTCP.tpl
+++ b/library/common/templates/classes/ingress/_appIngressTCP.tpl
@@ -14,7 +14,7 @@ within the common library.
   {{- $IngressName = printf "%v-%v" $IngressName $values.nameSuffix -}}
 {{ end -}}
 {{- $svcName := $values.serviceName | default (include "common.names.fullname" .) -}}
-{{- $svcPort := $values.servicePort | default $.Values.service.port.port -}}
+{{- $svcPort := $values.servicePort | default $.Values.services.main.port.port -}}
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRouteTCP
 metadata:
diff --git a/library/common/templates/classes/ingress/_appIngressUDP.tpl b/library/common/templates/classes/ingress/_appIngressUDP.tpl
index b8e73747b4f..c4399fd391b 100644
--- a/library/common/templates/classes/ingress/_appIngressUDP.tpl
+++ b/library/common/templates/classes/ingress/_appIngressUDP.tpl
@@ -14,7 +14,7 @@ within the common library.
   {{- $IngressName = printf "%v-%v" $IngressName $values.nameSuffix -}}
 {{ end -}}
 {{- $svcName := $values.serviceName | default (include "common.names.fullname" .) -}}
-{{- $svcPort := $values.servicePort | default $.Values.service.port.port -}}
+{{- $svcPort := $values.servicePort | default $.Values.services.main.port.port -}}
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRouteUDP
 metadata:
diff --git a/library/common/templates/classes/ingress/_ingress.tpl b/library/common/templates/classes/ingress/_ingress.tpl
index b93d753714a..868ba48c7b3 100644
--- a/library/common/templates/classes/ingress/_ingress.tpl
+++ b/library/common/templates/classes/ingress/_ingress.tpl
@@ -32,7 +32,7 @@ within the common library.
   {{- $ingressName = printf "%v-%v" $ingressName $values.nameSuffix -}}
 {{ end -}}
 {{- $svcName := $values.serviceName | default (include "common.names.fullname" .) -}}
-{{- $svcPort := $values.servicePort | default $.Values.service.port.port -}}
+{{- $svcPort := $values.servicePort | default $.Values.services.main.port.port -}}
 apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
diff --git a/library/common/templates/lib/controller/_ports.tpl b/library/common/templates/lib/controller/_ports.tpl
index 257c9338513..decbda49b7d 100644
--- a/library/common/templates/lib/controller/_ports.tpl
+++ b/library/common/templates/lib/controller/_ports.tpl
@@ -21,34 +21,14 @@ This file is considered to be modified by the TrueCharts Project.
 Ports included by the controller.
 */}}
 {{- define "common.controller.ports" -}}
-  {{- $ports := list -}}
-  {{- with .Values.service -}}
-    {{- $serviceValues := deepCopy . -}}
-    {{/* append the ports for the main service */}}
-    {{- if .enabled -}}
-      {{- $_ := set .port "name" (default "http" .port.name) -}}
-      {{- $ports = mustAppend $ports .port -}}
-      {{- range $_ := .additionalPorts -}}
-        {{/* append the additonalPorts for the main service */}}
-        {{- $ports = mustAppend $ports . -}}
-      {{- end }}
-    {{- end }}
-    {{/* append the ports for each additional service */}}
-    {{- range $_ := .additionalServices }}
-      {{- if .enabled -}}
-        {{- $_ := set .port "name" (required "Missing port.name" .port.name) -}}
-        {{- $ports = mustAppend $ports .port -}}
-        {{- range $_ := .additionalPorts -}}
-          {{/* append the additonalPorts for each additional service */}}
-          {{- $ports = mustAppend $ports . -}}
-        {{- end }}
-      {{- end }}
-    {{- end }}
+{{- $ports := list -}}
     {{/* append the ports for each appAdditionalService - TrueCharts */}}
-    {{- if and $.Values.appAdditionalServicesEnabled $.Values.appAdditionalServices -}}
-      {{- range $name, $_ := $.Values.appAdditionalServices }}
-        {{- if .enabled -}}
-          {{- if kindIs "string" $name -}}
+    {{- if $.Values.services -}}
+      {{- range $name, $_ := $.Values.services }}
+	    {{- if or ( .enabled ) ( eq $name "main" ) -}}
+		  {{- if eq $name "main" -}}
+		    {{- $_ := set .port "name" (default "http" .port.name) -}}
+          {{- else if kindIs "string" $name -}}
             {{- $_ := set .port "name" (default .port.name | default $name) -}}
             {{- else -}}
             {{- $_ := set .port "name" (required "Missing port.name" .port.name) -}}
@@ -61,7 +41,19 @@ Ports included by the controller.
         {{- end }}
       {{- end }}
     {{- end }}
-  {{- end }}
+
+    {{- if $.Values.additionalServices -}}
+      {{- range $_ := $.Values.additionalServices }}
+        {{- if .enabled -}}
+          {{- $_ := set .port "name" (required "Missing port.name" .port.name) -}}
+          {{- $ports = mustAppend $ports .port -}}
+          {{- range $_ := .additionalPorts -}}
+            {{/* append the additonalPorts for each additional service */}}
+            {{- $ports = mustAppend $ports . -}}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+    {{- end }}
 
 {{/* export/render the list of ports */}}
 {{- if $ports -}}
diff --git a/library/common/templates/lib/controller/_probes.tpl b/library/common/templates/lib/controller/_probes.tpl
index c6c5d38a75a..47d3344217e 100644
--- a/library/common/templates/lib/controller/_probes.tpl
+++ b/library/common/templates/lib/controller/_probes.tpl
@@ -21,7 +21,7 @@ This file is considered to be modified by the TrueCharts Project.
 Probes selection logic.
 */}}
 {{- define "common.controller.probes" -}}
-{{- $svcPort := .Values.service.port.name -}}
+{{- $svcPort := .Values.services.main.port.name -}}
 {{- range $probeName, $probe := .Values.probes }}
   {{- if $probe.enabled -}}
     {{- "" | nindent 0 }}
diff --git a/library/common/templates/lib/resources/_appService.tpl b/library/common/templates/lib/resources/_appService.tpl
deleted file mode 100644
index 2ba32550c4c..00000000000
--- a/library/common/templates/lib/resources/_appService.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{/*
-Renders the additioanl Service objects from appAdditionalServices
-*/}}
-{{- define "common.appService" -}}
-  {{- /* Generate TrueNAS SCALE app services as required v1 */ -}}
-  {{- if and .Values.appAdditionalServicesEnabled .Values.appAdditionalServices -}}
-    {{- range $name, $srv := .Values.appAdditionalServices }}
-      {{- if $srv.enabled -}}
-          {{- print ("---") | nindent 0 -}}
-          {{- $serviceValues := $srv -}}
-          {{- if not $serviceValues.nameSuffix -}}
-            {{- $_ := set $serviceValues "nameSuffix" $name -}}
-          {{ end -}}
-          {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}}
-          {{- include "common.classes.service" $ -}}
-      {{- end }}
-    {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/library/common/values.yaml b/library/common/values.yaml
index 8b0baa8ae1b..5f5d130262b 100644
--- a/library/common/values.yaml
+++ b/library/common/values.yaml
@@ -129,48 +129,49 @@ probes:
       periodSeconds: 10
       failureThreshold: 30
 
-service:
-  enabled: true
-  type: ClusterIP
-  ## Specify the default port information
-  port:
+services:
+  main:
+    enabled: true
+    type: ClusterIP
+    ## Specify the default port information
     port:
-    ## name defaults to http
-    name:
-    protocol: TCP
-    ## Specify a service targetPort if you wish to differ the service port from the application port.
-    ## If targetPort is specified, this port number is used in the container definition instead of
-    ## service.port.port. Therefore named ports are not supported for this field.
-    targetPort:
-    ## Specify the nodePort value for the LoadBalancer and NodePort service types.
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+      port:
+      ## name defaults to http
+      name:
+      protocol: TCP
+      ## Specify a service targetPort if you wish to differ the service port from the application port.
+      ## If targetPort is specified, this port number is used in the container definition instead of
+      ## service.port.port. Therefore named ports are not supported for this field.
+      targetPort:
+      ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+      ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+      ##
+      # nodePort:
+    additionalPorts: []
+
+    ## Provide any additional annotations which may be required. This can be used to
+    ## set the LoadBalancer service type to internal only.
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
     ##
-    # nodePort:
-  additionalPorts: []
+    annotations: {}
+    labels: {}
 
-  ## Provide any additional annotations which may be required. This can be used to
-  ## set the LoadBalancer service type to internal only.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
-  ##
-  annotations: {}
-  labels: {}
-
-  additionalServices: []
-  # - enabled: false
-  #   nameSuffix: api
-  #   type: ClusterIP
-  #   # Specify the default port information
-  #   port:
-  #     port:
-  #     # name defaults to http
-  #     name:
-  #     protocol: TCP
-  #     # targetPort defaults to http
-  #     targetPort:
-  #     # nodePort:
-  #   additionalPorts: []
-  #   annotations: {}
-  #   labels: {}
+additionalServices: []
+# - enabled: false
+#   nameSuffix: api
+#   type: ClusterIP
+#   # Specify the default port information
+#   port:
+#     port:
+#     # name defaults to http
+#     name:
+#     protocol: TCP
+#     # targetPort defaults to http
+#     targetPort:
+#     # nodePort:
+#   additionalPorts: []
+#   annotations: {}
+#   labels: {}
 
 ingress:
   enabled: false