diff --git a/charts/incubator/rdesktop/values.yaml b/charts/incubator/rdesktop/values.yaml
deleted file mode 100644
index 4d7d280dd86..00000000000
--- a/charts/incubator/rdesktop/values.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-env:
-  UMASK: ""
-image:
-  pullPolicy: IfNotPresent
-  repository: tccr.io/truecharts/rdesktop
-  tag: latest@sha256:9edf5f0644a03dacdffe5a5e38ce0a88df287ef3e367e05407c1504155e83919
-persistence:
-  config:
-    enabled: true
-    mountPath: /config
-
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-service:
-  main:
-    ports:
-      main:
-        port: 3389
-        protocol: TCP
-        targetPort: 3389
-
-portal:
-  enabled: true
diff --git a/charts/incubator/rdesktop/.helmignore b/charts/stable/rdesktop/.helmignore
similarity index 100%
rename from charts/incubator/rdesktop/.helmignore
rename to charts/stable/rdesktop/.helmignore
diff --git a/charts/incubator/rdesktop/CHANGELOG.md b/charts/stable/rdesktop/CHANGELOG.md
similarity index 100%
rename from charts/incubator/rdesktop/CHANGELOG.md
rename to charts/stable/rdesktop/CHANGELOG.md
diff --git a/charts/incubator/rdesktop/Chart.yaml b/charts/stable/rdesktop/Chart.yaml
similarity index 65%
rename from charts/incubator/rdesktop/Chart.yaml
rename to charts/stable/rdesktop/Chart.yaml
index bee5e481b3b..7c13dd93564 100644
--- a/charts/incubator/rdesktop/Chart.yaml
+++ b/charts/stable/rdesktop/Chart.yaml
@@ -1,7 +1,3 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Other
 apiVersion: v2
 appVersion: "latest"
 dependencies:
@@ -9,12 +5,12 @@ dependencies:
     repository: https://library-charts.truecharts.org
     version: 11.0.7
 deprecated: false
-description: Rdesktop(http://xrdp.org/) - Charts containing full desktop environments in many popular flavors for Alpine, Ubuntu, Arch, and Fedora accessible via RDP.
-home: https://truecharts.org/docs/charts/incubator/rdesktop
+description: Full desktop environments in many popular flavors for Alpine, Ubuntu, Arch, and Fedora accessible via RDP.
+home: https://truecharts.org/docs/charts/stable/rdesktop
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/rdesktop.png
 keywords:
   - rdesktop
-  - Other
+  - desktops
 kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
@@ -22,9 +18,14 @@ maintainers:
     url: https://truecharts.org
 name: rdesktop
 sources:
-  - https://github.com/truecharts/charts/tree/master/charts/incubator/rdesktop
+  - https://github.com/truecharts/charts/tree/master/charts/stable/rdesktop
   - http://xrdp.org/
   - https://github.com/orgs/linuxserver/packages/container/package/rdesktop
   - https://github.com/linuxserver/docker-rdesktop#readme
 type: application
-version: 2.0.5
+version: 3.0.0
+annotations:
+  truecharts.org/catagories: |
+    - desktops
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
diff --git a/charts/incubator/rdesktop/README.md b/charts/stable/rdesktop/README.md
similarity index 100%
rename from charts/incubator/rdesktop/README.md
rename to charts/stable/rdesktop/README.md
diff --git a/charts/stable/rdesktop/ci/alpine-i3-values.yaml b/charts/stable/rdesktop/ci/alpine-i3-values.yaml
new file mode 100644
index 00000000000..e4ad482b6b1
--- /dev/null
+++ b/charts/stable/rdesktop/ci/alpine-i3-values.yaml
@@ -0,0 +1 @@
+imageSelector: alpineI3Image
diff --git a/charts/stable/rdesktop/ci/alpine-icewm-values.yaml b/charts/stable/rdesktop/ci/alpine-icewm-values.yaml
new file mode 100644
index 00000000000..7d44bfa9b3d
--- /dev/null
+++ b/charts/stable/rdesktop/ci/alpine-icewm-values.yaml
@@ -0,0 +1 @@
+imageSelector: alpineICEWMImage
diff --git a/charts/stable/rdesktop/ci/alpine-kde-values.yaml b/charts/stable/rdesktop/ci/alpine-kde-values.yaml
new file mode 100644
index 00000000000..48f87ecfb97
--- /dev/null
+++ b/charts/stable/rdesktop/ci/alpine-kde-values.yaml
@@ -0,0 +1 @@
+imageSelector: alpineKDEImage
diff --git a/charts/stable/rdesktop/ci/alpine-mate-values.yaml b/charts/stable/rdesktop/ci/alpine-mate-values.yaml
new file mode 100644
index 00000000000..2ded37171bb
--- /dev/null
+++ b/charts/stable/rdesktop/ci/alpine-mate-values.yaml
@@ -0,0 +1 @@
+imageSelector: alpineMATEImage
diff --git a/charts/stable/rdesktop/ci/alpine-openbox-values.yaml b/charts/stable/rdesktop/ci/alpine-openbox-values.yaml
new file mode 100644
index 00000000000..4b7be30d38b
--- /dev/null
+++ b/charts/stable/rdesktop/ci/alpine-openbox-values.yaml
@@ -0,0 +1 @@
+imageSelector: alpineOpenBoxImage
diff --git a/charts/stable/rdesktop/ci/arch-i3-values.yaml b/charts/stable/rdesktop/ci/arch-i3-values.yaml
new file mode 100644
index 00000000000..5c41c0ddb19
--- /dev/null
+++ b/charts/stable/rdesktop/ci/arch-i3-values.yaml
@@ -0,0 +1 @@
+imageSelector: archI3Image
diff --git a/charts/stable/rdesktop/ci/arch-icewm-values.yaml b/charts/stable/rdesktop/ci/arch-icewm-values.yaml
new file mode 100644
index 00000000000..553fe966944
--- /dev/null
+++ b/charts/stable/rdesktop/ci/arch-icewm-values.yaml
@@ -0,0 +1 @@
+imageSelector: archICEWMImage
diff --git a/charts/stable/rdesktop/ci/arch-kde-values.yaml b/charts/stable/rdesktop/ci/arch-kde-values.yaml
new file mode 100644
index 00000000000..ab21302e3a4
--- /dev/null
+++ b/charts/stable/rdesktop/ci/arch-kde-values.yaml
@@ -0,0 +1 @@
+imageSelector: archKDEImage
diff --git a/charts/stable/rdesktop/ci/arch-mate-values.yaml b/charts/stable/rdesktop/ci/arch-mate-values.yaml
new file mode 100644
index 00000000000..c3024d58978
--- /dev/null
+++ b/charts/stable/rdesktop/ci/arch-mate-values.yaml
@@ -0,0 +1 @@
+imageSelector: archMATEImage
diff --git a/charts/stable/rdesktop/ci/arch-openbox-values.yaml b/charts/stable/rdesktop/ci/arch-openbox-values.yaml
new file mode 100644
index 00000000000..356630baea0
--- /dev/null
+++ b/charts/stable/rdesktop/ci/arch-openbox-values.yaml
@@ -0,0 +1 @@
+imageSelector: archOpenBoxImage
diff --git a/charts/stable/rdesktop/ci/arch-xfce-values.yaml b/charts/stable/rdesktop/ci/arch-xfce-values.yaml
new file mode 100644
index 00000000000..356630baea0
--- /dev/null
+++ b/charts/stable/rdesktop/ci/arch-xfce-values.yaml
@@ -0,0 +1 @@
+imageSelector: archOpenBoxImage
diff --git a/charts/stable/rdesktop/ci/base-values.yaml b/charts/stable/rdesktop/ci/base-values.yaml
new file mode 100644
index 00000000000..7e36603e844
--- /dev/null
+++ b/charts/stable/rdesktop/ci/base-values.yaml
@@ -0,0 +1 @@
+imageSelector: image
diff --git a/charts/stable/rdesktop/ci/fedora-i3-values.yaml b/charts/stable/rdesktop/ci/fedora-i3-values.yaml
new file mode 100644
index 00000000000..13630052fbd
--- /dev/null
+++ b/charts/stable/rdesktop/ci/fedora-i3-values.yaml
@@ -0,0 +1 @@
+imageSelector: fedoraI3Image
diff --git a/charts/stable/rdesktop/ci/fedora-icewm-values.yaml b/charts/stable/rdesktop/ci/fedora-icewm-values.yaml
new file mode 100644
index 00000000000..2e4a0c0e330
--- /dev/null
+++ b/charts/stable/rdesktop/ci/fedora-icewm-values.yaml
@@ -0,0 +1 @@
+imageSelector: fedoraICEWMImage
diff --git a/charts/stable/rdesktop/ci/fedora-kde-values.yaml b/charts/stable/rdesktop/ci/fedora-kde-values.yaml
new file mode 100644
index 00000000000..1b5cb524867
--- /dev/null
+++ b/charts/stable/rdesktop/ci/fedora-kde-values.yaml
@@ -0,0 +1 @@
+imageSelector: fedoraKDEImage
diff --git a/charts/stable/rdesktop/ci/fedora-mate-values.yaml b/charts/stable/rdesktop/ci/fedora-mate-values.yaml
new file mode 100644
index 00000000000..bf1377120a0
--- /dev/null
+++ b/charts/stable/rdesktop/ci/fedora-mate-values.yaml
@@ -0,0 +1 @@
+imageSelector: fedoraMATEImage
diff --git a/charts/stable/rdesktop/ci/fedora-openbox-values.yaml b/charts/stable/rdesktop/ci/fedora-openbox-values.yaml
new file mode 100644
index 00000000000..bf1377120a0
--- /dev/null
+++ b/charts/stable/rdesktop/ci/fedora-openbox-values.yaml
@@ -0,0 +1 @@
+imageSelector: fedoraMATEImage
diff --git a/charts/stable/rdesktop/ci/fedora-xfce-values.yaml b/charts/stable/rdesktop/ci/fedora-xfce-values.yaml
new file mode 100644
index 00000000000..cfe62c37411
--- /dev/null
+++ b/charts/stable/rdesktop/ci/fedora-xfce-values.yaml
@@ -0,0 +1 @@
+imageSelector: fedoraXFCEImage
diff --git a/charts/stable/rdesktop/ci/ubuntu-i3-values.yaml b/charts/stable/rdesktop/ci/ubuntu-i3-values.yaml
new file mode 100644
index 00000000000..4ba4a450e85
--- /dev/null
+++ b/charts/stable/rdesktop/ci/ubuntu-i3-values.yaml
@@ -0,0 +1 @@
+imageSelector: ubuntuI3Image
diff --git a/charts/stable/rdesktop/ci/ubuntu-icewm-values.yaml b/charts/stable/rdesktop/ci/ubuntu-icewm-values.yaml
new file mode 100644
index 00000000000..ecd6b3b66ce
--- /dev/null
+++ b/charts/stable/rdesktop/ci/ubuntu-icewm-values.yaml
@@ -0,0 +1 @@
+imageSelector: ubuntuICEWMImage
diff --git a/charts/stable/rdesktop/ci/ubuntu-kde-values.yaml b/charts/stable/rdesktop/ci/ubuntu-kde-values.yaml
new file mode 100644
index 00000000000..fd9458047e0
--- /dev/null
+++ b/charts/stable/rdesktop/ci/ubuntu-kde-values.yaml
@@ -0,0 +1 @@
+imageSelector: ubuntuKDEImage
diff --git a/charts/stable/rdesktop/ci/ubuntu-mate-values.yaml b/charts/stable/rdesktop/ci/ubuntu-mate-values.yaml
new file mode 100644
index 00000000000..e9fa74db92d
--- /dev/null
+++ b/charts/stable/rdesktop/ci/ubuntu-mate-values.yaml
@@ -0,0 +1 @@
+imageSelector: ubuntuMATEImage
diff --git a/charts/stable/rdesktop/ci/ubuntu-openbox-values.yaml b/charts/stable/rdesktop/ci/ubuntu-openbox-values.yaml
new file mode 100644
index 00000000000..31d0a0adb69
--- /dev/null
+++ b/charts/stable/rdesktop/ci/ubuntu-openbox-values.yaml
@@ -0,0 +1 @@
+imageSelector: ubuntuOpenBoxImage
diff --git a/charts/stable/rdesktop/ci/ubuntu-xfce-values.yaml b/charts/stable/rdesktop/ci/ubuntu-xfce-values.yaml
new file mode 100644
index 00000000000..d7af7c6d92f
--- /dev/null
+++ b/charts/stable/rdesktop/ci/ubuntu-xfce-values.yaml
@@ -0,0 +1 @@
+imageSelector: ubuntuXFCEImage
diff --git a/charts/stable/rdesktop/docs/credentials.md b/charts/stable/rdesktop/docs/credentials.md
new file mode 100644
index 00000000000..6bcaeedfd51
--- /dev/null
+++ b/charts/stable/rdesktop/docs/credentials.md
@@ -0,0 +1,4 @@
+# Default credentials
+
+- Username: `abc`
+- Password: `abc`
diff --git a/charts/incubator/rdesktop/icon.png b/charts/stable/rdesktop/icon.png
similarity index 100%
rename from charts/incubator/rdesktop/icon.png
rename to charts/stable/rdesktop/icon.png
diff --git a/charts/incubator/rdesktop/questions.yaml b/charts/stable/rdesktop/questions.yaml
similarity index 64%
rename from charts/incubator/rdesktop/questions.yaml
rename to charts/stable/rdesktop/questions.yaml
index 90d7264b42a..42035f4773d 100644
--- a/charts/incubator/rdesktop/questions.yaml
+++ b/charts/stable/rdesktop/questions.yaml
@@ -4,23 +4,71 @@ portals:
 # Include{portalLink}
 questions:
 # Include{global}
+  - variable: imageSelector
+    group: Container Image
+    label: Select Image
+    schema:
+      type: string
+      default: image
+      enum:
+        # XFCE
+        - value: image
+          description: XFCE Alpine
+        - value: ubuntuXFCEImage
+          description: XFCE Ubuntu
+        - value: fedoraXFCEImage
+          description: XFCE Fedora
+        - value: archXFCEImage
+          description: XFCE Arch
+        # KDE
+        - value: alpineKDEImage
+          description: KDE Alpine
+        - value: ubuntuKDEImage
+          description: KDE Ubuntu
+        - value: fedoraKDEImage
+          description: KDE Fedora
+        - value: archKDEImage
+          description: KDE Arch
+        # Mate
+        - value: alpineMATEImage
+          description: Mate Alpine
+        - value: ubuntuMATEImage
+          description: Mate Ubuntu
+        - value: fedoraMATEImage
+          description: Mate Fedora
+        - value: archMATEImage
+          description: Mate Arch
+        # I3
+        - value: alpineI3Image
+          description: I3 Alpine
+        - value: ubuntuI3Image
+          description: I3 Ubuntu
+        - value: fedoraI3Image
+          description: I3 Fedora
+        - value: archI3Image
+          description: I3 Arch
+        # OpenBox
+        - value: alpineOpenBoxImage
+          description: OpenBox Alpine
+        - value: ubuntuOpenBoxImage
+          description: OpenBox Ubuntu
+        - value: fedoraOpenBoxImage
+          description: OpenBox Fedora
+        - value: archOpenBoxImage
+          description: OpenBox Arch
+        # OpenBox
+        - value: alpineICEWMImage
+          description: ICEWM Alpine
+        - value: ubuntuICEWMImage
+          description: ICEWM Ubuntu
+        - value: fedoraICEWMImage
+          description: ICEWM Fedora
+        - value: archICEWMImage
+          description: ICEWM Arch
 # Include{controller}
 # Include{replicas}
 # Include{replica1}
 # Include{controllerExpertExtraArgs}
-  - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: UMASK
-          label: "UMASK"
-          description: "Container Variable UMASK"
-          schema:
-            type: string
-            default: ""
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/rdesktop/templates/common.yaml b/charts/stable/rdesktop/templates/common.yaml
similarity index 100%
rename from charts/incubator/rdesktop/templates/common.yaml
rename to charts/stable/rdesktop/templates/common.yaml
diff --git a/charts/stable/rdesktop/values.yaml b/charts/stable/rdesktop/values.yaml
new file mode 100644
index 00000000000..c266cf53750
--- /dev/null
+++ b/charts/stable/rdesktop/values.yaml
@@ -0,0 +1,127 @@
+image:
+  pullPolicy: IfNotPresent
+  repository: tccr.io/truecharts/rdesktop
+  tag: latest@sha256:9edf5f0644a03dacdffe5a5e38ce0a88df287ef3e367e05407c1504155e83919
+ubuntuXFCEImage:
+  repository: tccr.io/truecharts/rdesktop-ubuntu-xfce
+  tag: latest@sha256:999ac2613b9a436a524a8843796b226d146e877fb547609f90cdba045efeb3bd
+  pullPolicy: Always
+fedoraXFCEImage:
+  repository: tccr.io/truecharts/rdesktop-fedora-xfce
+  tag: latest@sha256:1bb0e52aaf8b324abe7ac65aec83bfc5df46d06e059de6bbba8d7f8eb579233d
+  pullPolicy: Always
+archXFCEImage:
+  repository: tccr.io/truecharts/rdesktop-arch-xfce
+  tag: latest@sha256:40f8c4f0cea4f559ec61a33b083c54a281a83b3ef9fd896e7bac3a8264c78fd6
+  pullPolicy: Always
+
+alpineKDEImage:
+  repository: tccr.io/truecharts/rdesktop-alpine-kde
+  tag: latest@sha256:67f4e75c86b7e4f35a02add54be766213e1c53336cbc939951f108f2455a674e
+  pullPolicy: Always
+ubuntuKDEImage:
+  repository: tccr.io/truecharts/rdesktop-ubuntu-kde
+  tag: latest@sha256:7185170eb2a2f2b14a0bbaa9a67ad67703f602a3596e30d38ed93dd5cd99208b
+  pullPolicy: Always
+fedoraKDEImage:
+  repository: tccr.io/truecharts/rdesktop-fedora-kde
+  tag: latest@sha256:d8b38a0b5c2ffdecc9c6e3f3db0d6564d52ca9333f88768440a000871146151e
+  pullPolicy: Always
+archKDEImage:
+  repository: tccr.io/truecharts/rdesktop-arch-kde
+  tag: latest@sha256:f139274e5e2e283a90dd52c1ef1043b8efa5844f554c6437d5bb1b7ef9949950
+  pullPolicy: Always
+
+alpineMATEImage:
+  repository: tccr.io/truecharts/rdesktop-alpine-mate
+  tag: latest@sha256:72f732e16e15d9ed230de40748c0e3a90a6746186585711280638f73cb0bb6c2
+  pullPolicy: Always
+ubuntuMATEImage:
+  repository: tccr.io/truecharts/rdesktop-ubuntu-mate
+  tag: latest@sha256:4edf32e25bdd673e20f2373f68a90f45d2e311f62f92187b11c7bed9c8d5adc0
+  pullPolicy: Always
+fedoraMATEImage:
+  repository: tccr.io/truecharts/rdesktop-fedora-mate
+  tag: latest@sha256:1517d4659c57c97ae5e31aaceab510c07abbd1665901e11428fb5409e07316af
+  pullPolicy: Always
+archMATEImage:
+  repository: tccr.io/truecharts/rdesktop-arch-mate
+  tag: latest@sha256:5ce77bd6ad55c6e1b22c215335364fd55d0d4a2db573cd52e734238897324d8f
+  pullPolicy: Always
+
+alpineI3Image:
+  repository: tccr.io/truecharts/rdesktop-alpine-i3
+  tag: latest@sha256:c7ffc7c02df98d5eae240de507d371302ccdbb56f9d6c6c14a5c73f41f3cb928
+  pullPolicy: Always
+ubuntuI3Image:
+  repository: tccr.io/truecharts/rdesktop-ubuntu-i3
+  tag: latest@sha256:e82741919cdb05c60eab7503d74d9418fe54cfcdc62791180aadb0366f649256
+  pullPolicy: Always
+fedoraI3Image:
+  repository: tccr.io/truecharts/rdesktop-fedora-i3
+  tag: latest@sha256:a28398a7a4e2265543e95f1d2b76c7924a07bcc05678f0fb86eb6909f9012639
+  pullPolicy: Always
+archI3Image:
+  repository: tccr.io/truecharts/rdesktop-arch-i3
+  tag: latest@sha256:b6f6d2ff96b6cf709f9de3b3b41c4fc0999599b1eee348ae5ddf3b2b9d8ee0c6
+  pullPolicy: Always
+
+alpineOpenBoxImage:
+  repository: tccr.io/truecharts/rdesktop-alpine-openbox
+  tag: latest@sha256:652daa63a9a98678bbd0a0a7bda73eeca912bda7a6cefa08685e477628bc2917
+  pullPolicy: Always
+ubuntuOpenBoxImage:
+  repository: tccr.io/truecharts/rdesktop-ubuntu-openbox
+  tag: latest@sha256:e0e53a55a59c0d144f62e7fac52b7363107d2e9b3c0b83fd8fdf8ea305ccd822
+  pullPolicy: Always
+fedoraOpenBoxImage:
+  repository: tccr.io/truecharts/rdesktop-fedora-openbox
+  tag: latest@sha256:73f3202f3a2e8654667ee0b98844269fbe6ce4d2fdb73bc371a8fe4fb611fcd5
+  pullPolicy: Always
+archOpenBoxImage:
+  repository: tccr.io/truecharts/rdesktop-arch-openbox
+  tag: latest@sha256:799d145d81db091e67d76de59ee08e440c7b713cdc163aa43b694e80c42b0f71
+  pullPolicy: Always
+
+alpineICEWMImage:
+  repository: tccr.io/truecharts/rdesktop-alpine-icewm
+  tag: latest@sha256:daf4d50a0f839e2ee6c52d8b50557710904da9c2b2d10fa7a85ce5601b45f0b6
+  pullPolicy: Always
+ubuntuICEWMImage:
+  repository: tccr.io/truecharts/rdesktop-ubuntu-icewm
+  tag: latest@sha256:7d2008f696b331a8806b1d1e9a70b02b5ee66656c9e46f4b053490cf5f5341bd
+  pullPolicy: Always
+fedoraICEWMImage:
+  repository: tccr.io/truecharts/rdesktop-fedora-icewm
+  tag: latest@sha256:a3e6f4ca498209a459a4702de071a9e89d18ca03ca66a0954ecc1b0d3077ba35
+  pullPolicy: Always
+archICEWMImage:
+  repository: tccr.io/truecharts/rdesktop-arch-icewm
+  tag: latest@sha256:24ce9bb6fc1afb60ea52e3ea2a69f908e01fec2ca151e4bc6c9ef2458cf9d399
+  pullPolicy: Always
+
+imageSelector: image
+
+podSecurityContext:
+  runAsGroup: 0
+  runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+service:
+  main:
+    ports:
+      main:
+        port: 3389
+        protocol: HTTP
+        targetPort: 3389
+
+persistence:
+  config:
+    enabled: true
+    mountPath: /config
+
+portal:
+  enabled: true