diff --git a/charts/incubator/homebox/.helmignore b/charts/stable/homebox/.helmignore
similarity index 100%
rename from charts/incubator/homebox/.helmignore
rename to charts/stable/homebox/.helmignore
diff --git a/charts/incubator/homebox/CHANGELOG.md b/charts/stable/homebox/CHANGELOG.md
similarity index 100%
rename from charts/incubator/homebox/CHANGELOG.md
rename to charts/stable/homebox/CHANGELOG.md
diff --git a/charts/incubator/homebox/Chart.yaml b/charts/stable/homebox/Chart.yaml
similarity index 98%
rename from charts/incubator/homebox/Chart.yaml
rename to charts/stable/homebox/Chart.yaml
index 4038589ac7f..44fe475fc2b 100644
--- a/charts/incubator/homebox/Chart.yaml
+++ b/charts/stable/homebox/Chart.yaml
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/homebox
   - https://github.com/hay-kot/homebox
 type: application
-version: 0.0.3
+version: 1.0.0
 annotations:
   truecharts.org/catagories: |
     - inventory
diff --git a/charts/incubator/homebox/README.md b/charts/stable/homebox/README.md
similarity index 100%
rename from charts/incubator/homebox/README.md
rename to charts/stable/homebox/README.md
diff --git a/charts/incubator/homebox/icon.png b/charts/stable/homebox/icon.png
similarity index 100%
rename from charts/incubator/homebox/icon.png
rename to charts/stable/homebox/icon.png
diff --git a/charts/incubator/homebox/questions.yaml b/charts/stable/homebox/questions.yaml
similarity index 100%
rename from charts/incubator/homebox/questions.yaml
rename to charts/stable/homebox/questions.yaml
diff --git a/charts/incubator/homebox/templates/_secret.tpl b/charts/stable/homebox/templates/_secret.tpl
similarity index 100%
rename from charts/incubator/homebox/templates/_secret.tpl
rename to charts/stable/homebox/templates/_secret.tpl
diff --git a/charts/incubator/homebox/templates/common.yaml b/charts/stable/homebox/templates/common.yaml
similarity index 100%
rename from charts/incubator/homebox/templates/common.yaml
rename to charts/stable/homebox/templates/common.yaml
diff --git a/charts/incubator/homebox/values.yaml b/charts/stable/homebox/values.yaml
similarity index 100%
rename from charts/incubator/homebox/values.yaml
rename to charts/stable/homebox/values.yaml
diff --git a/charts/stable/penpot/Chart.yaml b/charts/stable/penpot/Chart.yaml
index 2677607345a..6589f507fd5 100644
--- a/charts/stable/penpot/Chart.yaml
+++ b/charts/stable/penpot/Chart.yaml
@@ -32,7 +32,7 @@ sources:
   - https://hub.docker.com/r/penpotapp/frontend
   - https://hub.docker.com/r/penpotapp/backend
 type: application
-version: 2.0.1
+version: 2.0.2
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/penpot/questions.yaml b/charts/stable/penpot/questions.yaml
index 7cbdfd23773..a2fb73d519b 100644
--- a/charts/stable/penpot/questions.yaml
+++ b/charts/stable/penpot/questions.yaml
@@ -148,25 +148,25 @@ questions:
                         type: string
                         required: true
                         default: ""
-                    - variable: smtp_host
+                    - variable: host
                       label: SMTP Host
                       schema:
                         type: string
                         required: true
                         default: ""
-                    - variable: smtp_port
+                    - variable: port
                       label: SMTP Port
                       schema:
                         type: int
                         required: true
                         default: 587
-                    - variable: smtp_user
+                    - variable: user
                       label: SMTP User
                       schema:
                         type: string
                         required: true
                         default: ""
-                    - variable: smtp_pass
+                    - variable: pass
                       label: SMTP Pass
                       schema:
                         type: string