diff --git a/charts/incubator/kubeapps/questions.yaml b/charts/incubator/kubeapps/questions.yaml
index 690ba83237e..afccb3960ea 100644
--- a/charts/incubator/kubeapps/questions.yaml
+++ b/charts/incubator/kubeapps/questions.yaml
@@ -5,7 +5,7 @@ portals:
 questions:
 # Include{global}
 # Include{serviceRoot}
-        - variable: main
+        - variable: kubeapps
           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: main
+                    - variable: kubeapps
                       label: "Main Service Port Configuration"
                       schema:
                         additional_attrs: true
diff --git a/charts/incubator/kubeapps/values.yaml b/charts/incubator/kubeapps/values.yaml
index 9d943de0fef..940a34fcfb0 100644
--- a/charts/incubator/kubeapps/values.yaml
+++ b/charts/incubator/kubeapps/values.yaml
@@ -15,13 +15,23 @@ workload:
     
 service:
   main:
+    enabled: false
+    ports:
+      main:
+        enabled: false
+  kubeapps:
     enabled: true
+    primary: true
+    expandObjectName: false
+    labels:
+      truecharts.org/flagged: "true"
     selectorLabels:
       app.kubernetes.io/component: frontend
       truecharts.org/kahack: frontend
     ports:
-      main:
+      kubeapps:
         enabled: true
+        primary: true
         port: 8080
         targetPort: 8080