diff --git a/charts/stable/dokuwiki/Chart.yaml b/charts/stable/dokuwiki/Chart.yaml
index 2bfddb66670..29170084ca4 100644
--- a/charts/stable/dokuwiki/Chart.yaml
+++ b/charts/stable/dokuwiki/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: dokuwiki
-version: 1.0.10
+version: 2.0.0
 appVersion: "2021.11.28"
 description: Dokuwiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database.
 type: application
@@ -11,7 +11,7 @@ icon: https://truecharts.org/_static/img/appicons/dokuwiki.png
 keywords:
   - dokuwiki
 sources:
-  - https://hub.docker.com/r/linuxserver/dokuwiki
+  - https://hub.docker.com/r/bitnami/dokuwiki
 dependencies:
 - name: common
   repository: https://library-charts.truecharts.org
diff --git a/charts/stable/dokuwiki/questions.yaml b/charts/stable/dokuwiki/questions.yaml
index ae67975c25b..3a2c214eccd 100644
--- a/charts/stable/dokuwiki/questions.yaml
+++ b/charts/stable/dokuwiki/questions.yaml
@@ -75,6 +75,112 @@ 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: DOKUWIKI_USERNAME
+          label: "DokuWiki Username"
+          description: "Dokuwiki application username."
+          schema:
+            type: string
+            required: true
+            default: ""
+        - variable: DOKUWIKI_PASSWORD
+          label: "DokuWiki Password"
+          description: "Dokuwiki application password."
+          schema:
+            type: string
+            required: true
+            private: true
+            default: ""
+        - variable: DOKUWIKI_FULL_NAME
+          label: "DokuWiki Full Name"
+          description: "Dokuwiki application user full name."
+          schema:
+            type: string
+            required: true
+            default: ""
+        - variable: DOKUWIKI_EMAIL
+          label: "DokuWiki Email"
+          description: "Dokuwiki application email."
+          schema:
+            type: string
+            required: true
+            default: ""
+        - variable: DOKUWIKI_WIKI_NAME
+          label: "DokuWiki Wiki Name"
+          description: "Dokuwiki wiki name."
+          schema:
+            type: string
+            required: true
+            default: ""
+  - variable: env
+    group: "Container Configuration"
+    label: "Image Environment"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: ENABLE_PHP_CONFIGURATION
+          label: "Enable PHP Configuration"
+          description: "Enables configuration options for PHP"
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: PHP_ENABLE_OPCACHE
+                label: "PHP Enable OPCache"
+                description: "Enable OPcache for PHP scripts."
+                schema:
+                  type: string
+                  default: ""
+              - variable: PHP_EXPOSE_PHP
+                label: "PHP Expose PHP"
+                description: "Enables HTTP header with PHP version."
+                schema:
+                  type: string
+                  default: ""
+              - variable: PHP_MAX_EXECUTION_TIME
+                label: "PHP Max Execution Time"
+                description: "Maximum execution time for PHP scripts."
+                schema:
+                  type: string
+                  default: ""
+              - variable: PHP_MAX_INPUT_TIME
+                label: "PHP Max Input Time"
+                description: " Maximum input time for PHP scripts."
+                schema:
+                  type: string
+                  default: ""
+              - variable: PHP_MAX_INPUT_VARS
+                label: "PHP Max Input Vars"
+                description: "Maximum amount of input variables for PHP scripts."
+                schema:
+                  type: string
+                  default: ""
+              - variable: PHP_MEMORY_LIMIT
+                label: "PHP Memory Limit"
+                description: "Memory limit for PHP scripts."
+                schema:
+                  type: string
+                  default: "256M"
+              - variable: PHP_POST_MAX_SIZE
+                label: "PHP Post Max Size"
+                description: "Maximum size for PHP POST requests."
+                schema:
+                  type: string
+                  default: ""
+              - variable: PHP_UPLOAD_MAX_FILESIZE
+                label: "PHP Upload Max Filesize"
+                description: "Maximum file size for PHP uploads."
+                schema:
+                  type: string
+                  default: ""
 
 # Include{containerConfig}
 
@@ -144,7 +250,7 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 80
+                                    default: 8080
 
   - variable: serviceexpert
     group: "Networking and Services"
diff --git a/charts/stable/dokuwiki/values.yaml b/charts/stable/dokuwiki/values.yaml
index 9f37b0ac2e7..7d6d0c5ded7 100644
--- a/charts/stable/dokuwiki/values.yaml
+++ b/charts/stable/dokuwiki/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/dokuwiki
   pullPolicy: IfNotPresent
-  tag: v2021.11.28
+  tag: v20200729.0.0@sha256:31db35c11eea7dc2fe0eb2eedab9660f0f6eb400f2e7455cc96f3339ca874ab0
 
 securityContext:
   runAsNonRoot: false
@@ -11,16 +11,21 @@ podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
+secret:
+  DOKUWIKI_USERNAME: "admin"
+  DOKUWIKI_PASSWORD: "supersecret"
+  DOKUWIKI_FULL_NAME: "Super Admin"
+  DOKUWIKI_EMAIL: "admin@example.com"
+  DOKUWIKI_WIKI_NAME: "DokuWiki"
+
 service:
   main:
     ports:
       main:
-        targetPort: 80
         port: 10123
+        targetPort: 8080
 
 persistence:
   config:
     enabled: true
-    mountPath: "/config"
-  varrun:
-    enabled: true
+    mountPath: "/bitnami/dokuwiki"