diff --git a/charts/incubator/linkding/questions.yaml b/charts/incubator/linkding/questions.yaml
index b2ce773379a..2f97f687672 100644
--- a/charts/incubator/linkding/questions.yaml
+++ b/charts/incubator/linkding/questions.yaml
@@ -82,6 +82,32 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
+  - variable: secret
+    group: "Container Configuration"
+    label: "Image Secrets"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: DJANGO_SUPERUSER_USERNAME
+          label: "Superuser Username (Initial install only)"
+          schema:
+            type: string
+            default: ""
+            required: true
+        - variable: DJANGO_SUPERUSER_EMAIL
+          label: "Superuser Email (Initial install only)"
+          schema:
+            type: string
+            default: ""
+            required: true
+        - variable: DJANGO_SUPERUSER_PASSWORD
+          label: "Superuser Password (Initial install only)"
+          schema:
+            type: string
+            default: ""
+            private: true
+            required: true
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/linkding/values.yaml b/charts/incubator/linkding/values.yaml
index 861692797e8..c5dbcabb989 100644
--- a/charts/incubator/linkding/values.yaml
+++ b/charts/incubator/linkding/values.yaml
@@ -11,6 +11,11 @@ podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
+secret:
+  DJANGO_SUPERUSER_USERNAME: "superuser"
+  DJANGO_SUPERUSER_EMAIL: "super@example.com"
+  DJANGO_SUPERUSER_PASSWORD: "somesecret"
+
 env:
   LD_SERVER_PORT: "{{ .Values.service.main.ports.main.port }}"
   # User Defined
@@ -28,3 +33,25 @@ persistence:
   data:
     enabled: true
     mountPath: "/etc/linkding/data"
+
+lifecycle:
+  postStart:
+    exec:
+      command:
+        - "/bin/bash"
+        - "-c"
+        - |
+          if [ -f /etc/linkding/data/.superuser_exists ]; then
+            echo "Superuser has been created before. Skipping...";
+          else
+            echo "Creating superuser...";
+            export status=99;
+            until [ $status -eq 0 ];
+            do
+              python manage.py createsuperuser --username=${DJANGO_SUPERUSER_USERNAME} --email=${DJANGO_SUPERUSER_EMAIL} --noinput;
+              status=$?;
+              sleep 3;
+            done;
+            echo "This file is to ensure that init script won't try to create a superuser again and fail because it already exsits" > /etc/linkding/data/.superuser_exists;
+            echo "Superuser Created!";
+          fi;
diff --git a/charts/incubator/xwiki/CHANGELOG.md b/charts/stable/xwiki/CHANGELOG.md
similarity index 100%
rename from charts/incubator/xwiki/CHANGELOG.md
rename to charts/stable/xwiki/CHANGELOG.md
diff --git a/charts/incubator/xwiki/CONFIG.md b/charts/stable/xwiki/CONFIG.md
similarity index 100%
rename from charts/incubator/xwiki/CONFIG.md
rename to charts/stable/xwiki/CONFIG.md
diff --git a/charts/incubator/xwiki/Chart.yaml b/charts/stable/xwiki/Chart.yaml
similarity index 98%
rename from charts/incubator/xwiki/Chart.yaml
rename to charts/stable/xwiki/Chart.yaml
index dc57a3704f4..2c648e0ecef 100644
--- a/charts/incubator/xwiki/Chart.yaml
+++ b/charts/stable/xwiki/Chart.yaml
@@ -23,7 +23,7 @@ name: xwiki
 sources:
 - https://hub.docker.com/_/xwiki
 - https://github.com/xwiki/xwiki-docker
-version: 0.0.6
+version: 1.0.0
 annotations:
   truecharts.org/catagories: |
     - productivity
diff --git a/charts/incubator/xwiki/README.md b/charts/stable/xwiki/README.md
similarity index 100%
rename from charts/incubator/xwiki/README.md
rename to charts/stable/xwiki/README.md
diff --git a/charts/incubator/xwiki/helm-values.md b/charts/stable/xwiki/helm-values.md
similarity index 100%
rename from charts/incubator/xwiki/helm-values.md
rename to charts/stable/xwiki/helm-values.md
diff --git a/charts/incubator/xwiki/questions.yaml b/charts/stable/xwiki/questions.yaml
similarity index 100%
rename from charts/incubator/xwiki/questions.yaml
rename to charts/stable/xwiki/questions.yaml
diff --git a/charts/incubator/xwiki/security.md b/charts/stable/xwiki/security.md
similarity index 100%
rename from charts/incubator/xwiki/security.md
rename to charts/stable/xwiki/security.md
diff --git a/charts/incubator/xwiki/templates/common.yaml b/charts/stable/xwiki/templates/common.yaml
similarity index 100%
rename from charts/incubator/xwiki/templates/common.yaml
rename to charts/stable/xwiki/templates/common.yaml
diff --git a/charts/incubator/xwiki/values.yaml b/charts/stable/xwiki/values.yaml
similarity index 100%
rename from charts/incubator/xwiki/values.yaml
rename to charts/stable/xwiki/values.yaml