diff --git a/charts/incubator/kubeapps/.helmignore b/charts/enterprise/kubeapps/.helmignore
similarity index 100%
rename from charts/incubator/kubeapps/.helmignore
rename to charts/enterprise/kubeapps/.helmignore
diff --git a/charts/incubator/kubeapps/Chart.yaml b/charts/enterprise/kubeapps/Chart.yaml
similarity index 98%
rename from charts/incubator/kubeapps/Chart.yaml
rename to charts/enterprise/kubeapps/Chart.yaml
index ef730844e2d..f07cd416615 100644
--- a/charts/incubator/kubeapps/Chart.yaml
+++ b/charts/enterprise/kubeapps/Chart.yaml
@@ -41,4 +41,4 @@ sources:
   - https://github.com/cert-manager
   - https://github.com/truecharts/charts/tree/master/charts/enterprise/KubeApps
 type: application
-version: 0.0.3
+version: 0.0.4
diff --git a/charts/incubator/kubeapps/LICENSE b/charts/enterprise/kubeapps/LICENSE
similarity index 100%
rename from charts/incubator/kubeapps/LICENSE
rename to charts/enterprise/kubeapps/LICENSE
diff --git a/charts/incubator/kubeapps/README.md b/charts/enterprise/kubeapps/README.md
similarity index 100%
rename from charts/incubator/kubeapps/README.md
rename to charts/enterprise/kubeapps/README.md
diff --git a/charts/enterprise/kubeapps/docs/token.md b/charts/enterprise/kubeapps/docs/token.md
new file mode 100644
index 00000000000..df1b9f5fb5d
--- /dev/null
+++ b/charts/enterprise/kubeapps/docs/token.md
@@ -0,0 +1,6 @@
+# Getting a Login Token
+
+Currently KubeApps, by default, requires a kubernetes token to login.
+
+To aquire a temporary(!) token, enter the command given in the "notes" section (bottom right corner in SCALE WebUI) and copy the token given to the WebGUI of KubeApps
+
diff --git a/charts/enterprise/kubeapps/icon.png b/charts/enterprise/kubeapps/icon.png
new file mode 100644
index 00000000000..7ebf644fcfa
Binary files /dev/null and b/charts/enterprise/kubeapps/icon.png differ
diff --git a/charts/incubator/kubeapps/questions.yaml b/charts/enterprise/kubeapps/questions.yaml
similarity index 94%
rename from charts/incubator/kubeapps/questions.yaml
rename to charts/enterprise/kubeapps/questions.yaml
index afccb3960ea..4ac699c6a7c 100644
--- a/charts/incubator/kubeapps/questions.yaml
+++ b/charts/enterprise/kubeapps/questions.yaml
@@ -5,7 +5,7 @@ portals:
 questions:
 # Include{global}
 # Include{serviceRoot}
-        - variable: kubeapps
+        - variable: tckubeapps
           label: "Main Service"
           description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
@@ -14,7 +14,7 @@ questions:
             attrs:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
-                    - variable: kubeapps
+                    - variable: tckubeapps
                       label: "Main Service Port Configuration"
                       schema:
                         additional_attrs: true
diff --git a/charts/incubator/kubeapps/templates/NOTES.txt b/charts/enterprise/kubeapps/templates/NOTES.txt
similarity index 50%
rename from charts/incubator/kubeapps/templates/NOTES.txt
rename to charts/enterprise/kubeapps/templates/NOTES.txt
index 5bb3fc2ffa9..386230a6b24 100644
--- a/charts/incubator/kubeapps/templates/NOTES.txt
+++ b/charts/enterprise/kubeapps/templates/NOTES.txt
@@ -1,5 +1,6 @@
 {{- include "tc.v1.common.lib.chart.notes" $ -}}
 
-TO generate a Login Token, run this in terminal:
+To generate a Login Token, run this in terminal:
 {{- $fullname := include "tc.v1.common.lib.chart.names.fullname" $ -}}
-(k3s) kubectl create token {{ $fullname }}
+(k3s) kubectl create token {{ $fullname }} -n {{ .Release.Namespace }}
+
diff --git a/charts/incubator/kubeapps/templates/common.yaml b/charts/enterprise/kubeapps/templates/common.yaml
similarity index 100%
rename from charts/incubator/kubeapps/templates/common.yaml
rename to charts/enterprise/kubeapps/templates/common.yaml
diff --git a/charts/incubator/kubeapps/values.yaml b/charts/enterprise/kubeapps/values.yaml
similarity index 83%
rename from charts/incubator/kubeapps/values.yaml
rename to charts/enterprise/kubeapps/values.yaml
index 47908bef460..fd587b1ea3f 100644
--- a/charts/incubator/kubeapps/values.yaml
+++ b/charts/enterprise/kubeapps/values.yaml
@@ -12,14 +12,14 @@ portal:
 workload:
   main:
     enabled: false
-
+    
 service:
   main:
     enabled: false
     ports:
       main:
         enabled: false
-  kubeapps:
+  tckubeapps:
     enabled: true
     primary: true
     expandObjectName: false
@@ -29,17 +29,18 @@ service:
       app.kubernetes.io/component: frontend
       truecharts.org/kahack: frontend
     ports:
-      kubeapps:
+      tckubeapps:
         enabled: true
         primary: true
         port: 8080
         targetPort: 8080
 
+    
 serviceAccount:
   kubeapps-operator:
     enabled: true
     primary: true
-
+    
 secret:
   kubeapps-operator-token:
     enabled: true
@@ -47,7 +48,7 @@ secret:
     annotations:
       kubernetes.io/service-account.name: kubeapps-operator
     stringData: "-"
-
+    
 rbac:
   kubeapps-operator:
     enabled: true
@@ -58,14 +59,14 @@ rbac:
       - apiGroups: ["*"]
         resources: ["*"]
         verbs: ["*"]
-
+        
 kubeapps:
   frontend:
     podLabels:
       truecharts.org/kahack: frontend
-    apprepository:
-      initialRepos:
-        - name: truecharts
-          url: https://charts.truecharts.org
-        - name: bitnami
-          url: https://charts.bitnami.com/bitnami
+  apprepository:
+    initialRepos:
+      - name: truecharts
+        url: https://charts.truecharts.org
+      - name: bitnami
+        url: https://charts.bitnami.com/bitnami
diff --git a/charts/incubator/kubeapps/icon.png b/charts/incubator/kubeapps/icon.png
deleted file mode 100644
index a8c715c02f1..00000000000
Binary files a/charts/incubator/kubeapps/icon.png and /dev/null differ