diff --git a/charts/dependency/mariadb/questions.yaml b/charts/dependency/mariadb/questions.yaml
index c63d8781bfc..28e6e0af81c 100644
--- a/charts/dependency/mariadb/questions.yaml
+++ b/charts/dependency/mariadb/questions.yaml
@@ -222,7 +222,7 @@ questions:
                       description: "Memory"
 # Include{persistenceAdvanced}
                     - variable: mountPath
-                      label: "mountPath (Non-editable"
+                      label: "mountPath (Non-editable)"
                       description: "Path inside the container the storage is mounted"
                       schema:
                         type: string
diff --git a/charts/dependency/postgresql/questions.yaml b/charts/dependency/postgresql/questions.yaml
index 84aea92a6b0..7fbf913ebab 100644
--- a/charts/dependency/postgresql/questions.yaml
+++ b/charts/dependency/postgresql/questions.yaml
@@ -222,7 +222,7 @@ questions:
                       description: "Memory"
 # Include{persistenceAdvanced}
                     - variable: mountPath
-                      label: "mountPath (Non-editable"
+                      label: "mountPath (Non-editable)"
                       description: "Path inside the container the storage is mounted"
                       schema:
                         type: string
diff --git a/charts/dependency/redis/questions.yaml b/charts/dependency/redis/questions.yaml
index 79ae7aeba59..2efd5f6f394 100644
--- a/charts/dependency/redis/questions.yaml
+++ b/charts/dependency/redis/questions.yaml
@@ -207,7 +207,7 @@ questions:
                       description: "Memory"
 # Include{persistenceAdvanced}
                     - variable: mountPath
-                      label: "mountPath (Non-editable"
+                      label: "mountPath (Non-editable)"
                       description: "Path inside the container the storage is mounted"
                       schema:
                         type: string
diff --git a/charts/incubator/guacamole-client/CHANGELOG.md b/charts/stable/guacamole-client/CHANGELOG.md
similarity index 100%
rename from charts/incubator/guacamole-client/CHANGELOG.md
rename to charts/stable/guacamole-client/CHANGELOG.md
diff --git a/charts/incubator/guacamole-client/CONFIG.md b/charts/stable/guacamole-client/CONFIG.md
similarity index 100%
rename from charts/incubator/guacamole-client/CONFIG.md
rename to charts/stable/guacamole-client/CONFIG.md
diff --git a/charts/incubator/guacamole-client/Chart.yaml b/charts/stable/guacamole-client/Chart.yaml
similarity index 98%
rename from charts/incubator/guacamole-client/Chart.yaml
rename to charts/stable/guacamole-client/Chart.yaml
index eee28e94704..f07e39722e0 100644
--- a/charts/incubator/guacamole-client/Chart.yaml
+++ b/charts/stable/guacamole-client/Chart.yaml
@@ -25,7 +25,7 @@ sources:
 - https://hub.docker.com/r/guacamole/guacamole
 - http://guacamole.incubator.apache.org/doc/gug/introduction.html
 type: application
-version: 0.0.2
+version: 1.0.0
 annotations:
   truecharts.org/catagories: |
     - utilities
diff --git a/charts/incubator/guacamole-client/README.md b/charts/stable/guacamole-client/README.md
similarity index 100%
rename from charts/incubator/guacamole-client/README.md
rename to charts/stable/guacamole-client/README.md
diff --git a/charts/incubator/guacamole-client/helm-values.md b/charts/stable/guacamole-client/helm-values.md
similarity index 100%
rename from charts/incubator/guacamole-client/helm-values.md
rename to charts/stable/guacamole-client/helm-values.md
diff --git a/charts/incubator/guacamole-client/questions.yaml b/charts/stable/guacamole-client/questions.yaml
similarity index 100%
rename from charts/incubator/guacamole-client/questions.yaml
rename to charts/stable/guacamole-client/questions.yaml
diff --git a/charts/incubator/guacamole-client/security.md b/charts/stable/guacamole-client/security.md
similarity index 100%
rename from charts/incubator/guacamole-client/security.md
rename to charts/stable/guacamole-client/security.md
diff --git a/charts/incubator/guacamole-client/templates/_configmap.tpl b/charts/stable/guacamole-client/templates/_configmap.tpl
similarity index 100%
rename from charts/incubator/guacamole-client/templates/_configmap.tpl
rename to charts/stable/guacamole-client/templates/_configmap.tpl
diff --git a/charts/incubator/guacamole-client/templates/common.yaml b/charts/stable/guacamole-client/templates/common.yaml
similarity index 100%
rename from charts/incubator/guacamole-client/templates/common.yaml
rename to charts/stable/guacamole-client/templates/common.yaml
diff --git a/charts/incubator/guacamole-client/values.yaml b/charts/stable/guacamole-client/values.yaml
similarity index 87%
rename from charts/incubator/guacamole-client/values.yaml
rename to charts/stable/guacamole-client/values.yaml
index dea66ef2f57..3fca5e11dfd 100644
--- a/charts/incubator/guacamole-client/values.yaml
+++ b/charts/stable/guacamole-client/values.yaml
@@ -189,43 +189,22 @@ initContainers:
     command: ["/bin/sh", "-c"]
     args:
       - >
-        echo "Waiting for DB to be ready...";
-        DBREADY=0;
-        for i in {1..10};
-        do pg_isready -t 5 -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT;
-          if [ $? -eq 0 ];
-            then
-              echo "DB is ready!";
-              DBREADY=1;
-              break;
-            else
-              echo "DB not ready yet.";
-          fi;
-          echo "Waiting...";
-          sleep 5;
-        done;
-        if [ $DBREADY -eq 1 ];
+        psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -o '/dev/null' -c 'SELECT * FROM public.guacamole_user';
+        if [ $? -eq 0 ];
           then
-            psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -q -c 'SELECT * FROM public.guacamole_user';
+            echo "DB already initialized. Skipping...";
+          else
+            echo "Initializing DB's schema...";
+            psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -a -w -f /initdbdata/initdb.sql;
             if [ $? -eq 0 ];
               then
-                echo "DB already initialized. Skipping...";
+                echo "DB's schema initialized successfully!";
+                exit 0;
               else
-                echo "Initializing DB's schema...";
-                psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -a -w -f /initdbdata/initdb.sql;
-                if [ $? -eq 0 ];
-                  then
-                    echo "DB's schema initialized successfully!";
-                    exit 0;
-                  else
-                    echo "DB's schema failed to initialize.";
-                    exit 1;
-                fi;
+                echo "DB's schema failed to initialize.";
+                exit 1;
             fi;
-          else
-            echo "DB failed to start.";
         fi;
-
     # Until they release an image with the updated driver, we need to manually replace it.
     # https://issues.apache.org/jira/browse/GUACAMOLE-1433
     # https://github.com/apache/guacamole-client/pull/655