diff --git a/charts/incubator/grafana/.helmignore b/charts/stable/grafana/.helmignore
similarity index 100%
rename from charts/incubator/grafana/.helmignore
rename to charts/stable/grafana/.helmignore
diff --git a/charts/incubator/grafana/CHANGELOG.md b/charts/stable/grafana/CHANGELOG.md
similarity index 99%
rename from charts/incubator/grafana/CHANGELOG.md
rename to charts/stable/grafana/CHANGELOG.md
index 4d13276c25e..550e08f7267 100644
--- a/charts/incubator/grafana/CHANGELOG.md
+++ b/charts/stable/grafana/CHANGELOG.md
@@ -7,4 +7,3 @@
 #### Add
 
 * Add grafana to incubator Apps ([#1391](https://github.com/truecharts/apps/issues/1391))
-
diff --git a/charts/incubator/grafana/CONFIG.md b/charts/stable/grafana/CONFIG.md
similarity index 100%
rename from charts/incubator/grafana/CONFIG.md
rename to charts/stable/grafana/CONFIG.md
diff --git a/charts/incubator/grafana/Chart.yaml b/charts/stable/grafana/Chart.yaml
similarity index 95%
rename from charts/incubator/grafana/Chart.yaml
rename to charts/stable/grafana/Chart.yaml
index abf5fdddd81..35a5bfc8cb9 100644
--- a/charts/incubator/grafana/Chart.yaml
+++ b/charts/stable/grafana/Chart.yaml
@@ -23,10 +23,9 @@ sources:
   - https://github.com/bitnami/bitnami-docker-grafana
   - https://grafana.com/
 type: application
-version: 0.0.1
+version: 1.0.0
 annotations:
   truecharts.org/catagories: |
-    - media
-    - test
+    - metrics
   truecharts.org/SCALE-support: "true"
   truecharts.org/grade: U
diff --git a/charts/incubator/grafana/README.md b/charts/stable/grafana/README.md
similarity index 100%
rename from charts/incubator/grafana/README.md
rename to charts/stable/grafana/README.md
diff --git a/charts/incubator/grafana/helm-values.md b/charts/stable/grafana/helm-values.md
similarity index 100%
rename from charts/incubator/grafana/helm-values.md
rename to charts/stable/grafana/helm-values.md
diff --git a/charts/incubator/grafana/questions.yaml b/charts/stable/grafana/questions.yaml
similarity index 99%
rename from charts/incubator/grafana/questions.yaml
rename to charts/stable/grafana/questions.yaml
index 57b2ae95f45..bcd8c82d155 100644
--- a/charts/incubator/grafana/questions.yaml
+++ b/charts/stable/grafana/questions.yaml
@@ -75,6 +75,19 @@ questions:
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
 
+  - variable: secret
+    group: "Container Configuration"
+    label: "Secret Image Environment"
+    schema:
+      type: dict
+      attrs:
+        - variable: GF_SECURITY_ADMIN_PASSWORD
+          label: "Admin Password"
+          schema:
+            type: string
+            default: ""
+            required: true
+
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
@@ -86,7 +99,7 @@ questions:
           label: "Admin User"
           schema:
             type: string
-            default: ""
+            default: "admin"
             required: true
         - variable: GF_INSTALL_PLUGINS
           label: "Extra Plugins to Install"
@@ -94,7 +107,6 @@ questions:
           schema:
             type: string
             default: ""
-            required: true
         - variable: GF_AUTH_LDAP_ENABLED
           label: "enable LDAP"
           schema:
@@ -113,19 +125,6 @@ questions:
 
 # Include{containerConfig}
 
-  - variable: secret
-    group: "Container Configuration"
-    label: "Secret Image Environment"
-    schema:
-      type: dict
-      attrs:
-        - variable: GF_SECURITY_ADMIN_PASSWORD
-          label: "Admin Password"
-          schema:
-            type: string
-            default: ""
-            required: true
-
   - variable: service
     group: "Networking and Services"
     label: "Configure Service(s)"
diff --git a/charts/incubator/grafana/templates/common.yaml b/charts/stable/grafana/templates/common.yaml
similarity index 100%
rename from charts/incubator/grafana/templates/common.yaml
rename to charts/stable/grafana/templates/common.yaml
diff --git a/charts/incubator/grafana/templates/prometheusrules.yaml b/charts/stable/grafana/templates/prometheusrules.yaml
similarity index 100%
rename from charts/incubator/grafana/templates/prometheusrules.yaml
rename to charts/stable/grafana/templates/prometheusrules.yaml
diff --git a/charts/incubator/grafana/templates/servicemonitor.yaml b/charts/stable/grafana/templates/servicemonitor.yaml
similarity index 100%
rename from charts/incubator/grafana/templates/servicemonitor.yaml
rename to charts/stable/grafana/templates/servicemonitor.yaml
diff --git a/charts/incubator/grafana/values.yaml b/charts/stable/grafana/values.yaml
similarity index 100%
rename from charts/incubator/grafana/values.yaml
rename to charts/stable/grafana/values.yaml