diff --git a/incubator/factorio/4.0.9/app-changelog.md b/incubator/factorio/4.0.9/app-changelog.md
deleted file mode 100644
index 02bc9f73151..00000000000
--- a/incubator/factorio/4.0.9/app-changelog.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-## [factorio-4.0.9](https://github.com/truecharts/charts/compare/factorio-4.0.8...factorio-4.0.9) (2023-07-30)
-
-### Chore
-
-- update helm general non-major ([#11034](https://github.com/truecharts/charts/issues/11034))
-  
-  
\ No newline at end of file
diff --git a/incubator/factorio/4.0.9/charts/common-13.2.2.tgz b/incubator/factorio/4.0.9/charts/common-13.2.2.tgz
deleted file mode 100644
index a3a86cbd264..00000000000
Binary files a/incubator/factorio/4.0.9/charts/common-13.2.2.tgz and /dev/null differ
diff --git a/incubator/factorio/4.0.9/CHANGELOG.md b/incubator/factorio/4.1.0/CHANGELOG.md
similarity index 90%
rename from incubator/factorio/4.0.9/CHANGELOG.md
rename to incubator/factorio/4.1.0/CHANGELOG.md
index 8384505aabc..cfea80ef21e 100644
--- a/incubator/factorio/4.0.9/CHANGELOG.md
+++ b/incubator/factorio/4.1.0/CHANGELOG.md
@@ -4,6 +4,17 @@
 
 
 
+## [factorio-4.1.0](https://github.com/truecharts/charts/compare/factorio-5.0.0...factorio-4.1.0) (2023-08-30)
+
+
+
+
+
+## [factorio-5.0.0](https://github.com/truecharts/charts/compare/factorio-4.0.9...factorio-5.0.0) (2023-07-31)
+
+
+
+
 ## [factorio-4.0.9](https://github.com/truecharts/charts/compare/factorio-4.0.8...factorio-4.0.9) (2023-07-30)
 
 ### Chore
@@ -86,14 +97,3 @@
 ### Feat
 
 - hide advanced ingress options behind checbox ([#9203](https://github.com/truecharts/charts/issues/9203))
-  
-  ### Fix
-
-- fix mistakes on questions.yaml
-  
-  
-
-
-## [factorio-3.0.2](https://github.com/truecharts/charts/compare/factorio-3.0.1...factorio-3.0.2) (2023-02-10)
-
-### Fix
diff --git a/incubator/factorio/4.0.9/Chart.yaml b/incubator/factorio/4.1.0/Chart.yaml
similarity index 77%
rename from incubator/factorio/4.0.9/Chart.yaml
rename to incubator/factorio/4.1.0/Chart.yaml
index 61ed9ca22cc..066c4fa668d 100644
--- a/incubator/factorio/4.0.9/Chart.yaml
+++ b/incubator/factorio/4.1.0/Chart.yaml
@@ -1,27 +1,28 @@
 apiVersion: v2
-kubeVersion: ">=1.16.0-0"
-name: factorio
-version: 4.0.9
 appVersion: "stable"
-description: "This Chart Chart will download the latest stable release of the game, generate the map and you're ready to play."
-type: application
+dependencies:
+  - name: common
+    repository: https://library-charts.truecharts.org
+    version: 14.0.3
 deprecated: false
+description: A game in which you build and maintain factories.
 home: https://truecharts.org/charts/incubator/factorio
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/factorio.png
 keywords:
   - factorio
   - GameServers
-sources:
-  - https://github.com/truecharts/charts/tree/master/charts/incubator/factorio
-  - https://www.factorio.com/
-dependencies:
-  - name: common
-    repository: https://library-charts.truecharts.org
-    version: 13.2.2
+kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
     name: TrueCharts
     url: https://truecharts.org
+name: factorio
+sources:
+  - https://github.com/truecharts/charts/tree/master/charts/incubator/factorio
+  - hhttps://www.factorio.com/
+  - https://github.com/factoriotools/factorio-docker
+type: application
+version: 4.1.0
 annotations:
   truecharts.org/catagories: |
     - GameServers
diff --git a/incubator/factorio/4.0.9/README.md b/incubator/factorio/4.1.0/README.md
similarity index 100%
rename from incubator/factorio/4.0.9/README.md
rename to incubator/factorio/4.1.0/README.md
diff --git a/incubator/factorio/4.1.0/app-changelog.md b/incubator/factorio/4.1.0/app-changelog.md
new file mode 100644
index 00000000000..8db0bd5233b
--- /dev/null
+++ b/incubator/factorio/4.1.0/app-changelog.md
@@ -0,0 +1,4 @@
+
+
+## [factorio-4.1.0](https://github.com/truecharts/charts/compare/factorio-5.0.0...factorio-4.1.0) (2023-08-30)
+
diff --git a/incubator/factorio/4.0.9/app-readme.md b/incubator/factorio/4.1.0/app-readme.md
similarity index 76%
rename from incubator/factorio/4.0.9/app-readme.md
rename to incubator/factorio/4.1.0/app-readme.md
index 132b21a7c19..aacd860d14f 100644
--- a/incubator/factorio/4.0.9/app-readme.md
+++ b/incubator/factorio/4.1.0/app-readme.md
@@ -1,4 +1,4 @@
-This Chart Chart will download the latest stable release of the game, generate the map and you're ready to play.
+A game in which you build and maintain factories.
 
 This App is supplied by TrueCharts, for more information visit the manual: [https://truecharts.org/charts/incubator/factorio](https://truecharts.org/charts/incubator/factorio)
 
diff --git a/incubator/factorio/4.1.0/charts/common-14.0.3.tgz b/incubator/factorio/4.1.0/charts/common-14.0.3.tgz
new file mode 100644
index 00000000000..9dab2456ffc
Binary files /dev/null and b/incubator/factorio/4.1.0/charts/common-14.0.3.tgz differ
diff --git a/incubator/factorio/4.0.9/ix_values.yaml b/incubator/factorio/4.1.0/ix_values.yaml
similarity index 63%
rename from incubator/factorio/4.0.9/ix_values.yaml
rename to incubator/factorio/4.1.0/ix_values.yaml
index a6b0e44c8ca..d0dccd96096 100644
--- a/incubator/factorio/4.0.9/ix_values.yaml
+++ b/incubator/factorio/4.1.0/ix_values.yaml
@@ -1,7 +1,7 @@
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/factorio
-  tag: vstable@sha256:6a8a24374e3582abaebf34c9062627914c020d57d2ad88322e53eedf2c767c53
+  tag: vstable@sha256:110b9147fd5535d4ee6d5b1845b6e0a071a9e8bc4bfe854654c1fa2530d1bd16
 
 securityContext:
   container:
@@ -10,33 +10,12 @@ securityContext:
     runAsGroup: 0
     runAsUser: 0
 
-workload:
-  main:
-    podSpec:
-      containers:
-        main:
-          probes:
-            liveness:
-              enabled: false
-            readiness:
-              enabled: false
-            startup:
-              enabled: false
-          env:
-            GENERATE_NEW_SAVE: false
-            LOAD_LATEST_SAVE: true
-            SAVE_NAME: "_autosave1"
-            TOKEN: ""
-            UPDATE_MODS_ON_START: ""
-            USERNAME: ""
-
 service:
   main:
     ports:
       main:
         port: 34197
         protocol: udp
-        targetPort: 34197
   rcon:
     enabled: true
     ports:
@@ -44,7 +23,31 @@ service:
         enabled: true
         port: 27015
         protocol: tcp
-        targetPort: 27015
+
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              type: tcp
+              port: "{{ .Values.service.rcon.ports.rcon.port }}"
+            readiness:
+              type: tcp
+              port: "{{ .Values.service.rcon.ports.rcon.port }}"
+            startup:
+              type: tcp
+              port: "{{ .Values.service.rcon.ports.rcon.port }}"
+          env:
+            PORT: "{{ .Values.service.main.ports.main.port }}"
+            RCON_PORT: "{{ .Values.service.rcon.ports.rcon.port }}"
+            GENERATE_NEW_SAVE: false
+            LOAD_LATEST_SAVE: true
+            SAVE_NAME: "_autosave1"
+            TOKEN: ""
+            UPDATE_MODS_ON_START: ""
+            USERNAME: ""
 
 persistence:
   config:
diff --git a/incubator/factorio/4.0.9/questions.yaml b/incubator/factorio/4.1.0/questions.yaml
similarity index 99%
rename from incubator/factorio/4.0.9/questions.yaml
rename to incubator/factorio/4.1.0/questions.yaml
index 936f1ab4ccc..6a812bfcaf6 100644
--- a/incubator/factorio/4.0.9/questions.yaml
+++ b/incubator/factorio/4.1.0/questions.yaml
@@ -67,6 +67,7 @@ questions:
                       description: Deployment
                     - value: DaemonSet
                       description: DaemonSet
+
               - variable: replicas
                 label: Replicas (Advanced)
                 description: Set the number of Replicas
@@ -92,6 +93,7 @@ questions:
                               additional_attrs: true
                               type: dict
                               attrs:
+
                                 - variable: env
                                   group: App Configuration
                                   label: Image Environment
@@ -127,8 +129,8 @@ questions:
                                         label: Update server mods BEFORE starting the server
                                         description: If mods should be updated before starting the server
                                         schema:
-                                          type: string
-                                          default: ""
+                                          type: boolean
+                                          default: false
                                       - variable: USERNAME
                                         label: Factorio.com Username
                                         description: Import your factorio.com username
@@ -598,7 +600,7 @@ questions:
       attrs:
         - variable: config
           label: App Config Storage
-          description: Container Path factorio
+          description: Stores the Application Config.
           schema:
             additional_attrs: true
             type: dict
@@ -1142,7 +1144,7 @@ questions:
                   default: 0
               - variable: runAsGroup
                 label: runAsGroup
-                description: The groupID this App of the user running the application
+                description: The groupID of the user running the application
                 schema:
                   type: int
                   default: 0
diff --git a/incubator/kaizoku/0.0.1/templates/NOTES.txt b/incubator/factorio/4.1.0/templates/NOTES.txt
similarity index 100%
rename from incubator/kaizoku/0.0.1/templates/NOTES.txt
rename to incubator/factorio/4.1.0/templates/NOTES.txt
diff --git a/incubator/factorio/4.0.9/templates/common.yaml b/incubator/factorio/4.1.0/templates/common.yaml
similarity index 100%
rename from incubator/factorio/4.0.9/templates/common.yaml
rename to incubator/factorio/4.1.0/templates/common.yaml
diff --git a/incubator/factorio/4.0.9/values.yaml b/incubator/factorio/4.1.0/values.yaml
similarity index 100%
rename from incubator/factorio/4.0.9/values.yaml
rename to incubator/factorio/4.1.0/values.yaml
diff --git a/incubator/kaizoku/0.0.1/README.md b/incubator/kaizoku/0.0.1/README.md
deleted file mode 100644
index 7e59600739c..00000000000
--- a/incubator/kaizoku/0.0.1/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# README
diff --git a/incubator/kaizoku/0.0.1/app-changelog.md b/incubator/kaizoku/0.0.1/app-changelog.md
deleted file mode 100644
index bbabfa36721..00000000000
--- a/incubator/kaizoku/0.0.1/app-changelog.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-## [kaizoku-0.0.1]kaizoku-0.0.1 (2023-08-29)
-
diff --git a/incubator/kaizoku/0.0.1/charts/common-14.0.1.tgz b/incubator/kaizoku/0.0.1/charts/common-14.0.1.tgz
deleted file mode 100644
index 656c64047b2..00000000000
Binary files a/incubator/kaizoku/0.0.1/charts/common-14.0.1.tgz and /dev/null differ
diff --git a/incubator/kaizoku/0.0.1/charts/redis-6.0.66.tgz b/incubator/kaizoku/0.0.1/charts/redis-6.0.66.tgz
deleted file mode 100644
index 77495e13510..00000000000
Binary files a/incubator/kaizoku/0.0.1/charts/redis-6.0.66.tgz and /dev/null differ
diff --git a/incubator/kaizoku/0.0.1/templates/_secrets.tpl b/incubator/kaizoku/0.0.1/templates/_secrets.tpl
deleted file mode 100644
index 2ab54ac74e4..00000000000
--- a/incubator/kaizoku/0.0.1/templates/_secrets.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{/* Define the secrets */}}
-{{- define "kaizoku.secret" -}}
-
-{{- $user := .Values.cnpg.main.user -}}
-{{- $password := .Values.cnpg.main.creds.password | trimAll "\"" -}}
-{{- $host := .Values.cnpg.main.creds.host | trimAll "\""  -}}
-{{- $database := .Values.cnpg.main.database -}}
-
-kaizoku-secret:
-  enabled: true
-  data:
-    DATABASE_URL: {{ printf "postgresql://%v:%v@%v:5432/%v" $user $password $host $database }}
-{{- end -}}
diff --git a/incubator/kaizoku/0.0.1/templates/common.yaml b/incubator/kaizoku/0.0.1/templates/common.yaml
deleted file mode 100644
index 4e07d957094..00000000000
--- a/incubator/kaizoku/0.0.1/templates/common.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{/* Make sure all variables are set properly */}}
-{{- include "tc.v1.common.loader.init" . }}
-
-{{- $secret := include "kaizoku.secret" . | fromYaml -}}
-{{- if $secret -}}
-  {{ $secret := (mustMergeOverwrite .Values.secret $secret) }}
-  {{- $_ := set .Values "secret" $secret -}}
-{{- end -}}
-
-{{/* Render the templates */}}
-{{ include "tc.v1.common.loader.apply" . }}
diff --git a/incubator/kaizoku/0.0.1/CHANGELOG.md b/incubator/kaizoku/0.1.0/CHANGELOG.md
similarity index 52%
rename from incubator/kaizoku/0.0.1/CHANGELOG.md
rename to incubator/kaizoku/0.1.0/CHANGELOG.md
index 6c8ad2531af..9d6f558a7ae 100644
--- a/incubator/kaizoku/0.0.1/CHANGELOG.md
+++ b/incubator/kaizoku/0.1.0/CHANGELOG.md
@@ -4,5 +4,10 @@
 
 
 
+## [kaizoku-0.1.0](https://github.com/truecharts/charts/compare/kaizoku-0.0.1...kaizoku-0.1.0) (2023-08-30)
+
+
+
+
 ## [kaizoku-0.0.1]kaizoku-0.0.1 (2023-08-29)
 
diff --git a/incubator/kaizoku/0.0.1/Chart.yaml b/incubator/kaizoku/0.1.0/Chart.yaml
similarity index 87%
rename from incubator/kaizoku/0.0.1/Chart.yaml
rename to incubator/kaizoku/0.1.0/Chart.yaml
index d2c3e655aaf..75f486a5152 100644
--- a/incubator/kaizoku/0.0.1/Chart.yaml
+++ b/incubator/kaizoku/0.1.0/Chart.yaml
@@ -3,13 +3,13 @@ appVersion: "1.6.1"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 14.0.1
+    version: 14.0.3
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.66
+    version: 7.0.6
 deprecated: false
-description: Kaizoku is self-hosted manga downloader.
+description: A self-hosted manga downloader.
 home: https://truecharts.org/charts/incubator/kaizoku
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/kaizoku.png
 keywords:
@@ -24,7 +24,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/kaizoku
   - https://github.com/oae/kaizoku
 type: application
-version: 0.0.1
+version: 0.1.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/incubator/kaizoku/0.1.0/README.md b/incubator/kaizoku/0.1.0/README.md
new file mode 100644
index 00000000000..83229a60265
--- /dev/null
+++ b/incubator/kaizoku/0.1.0/README.md
@@ -0,0 +1,27 @@
+# README
+
+## General Info
+
+TrueCharts can be installed as both *normal* Helm Charts or as Apps on TrueNAS SCALE.
+However only installations using the TrueNAS SCALE Apps system are supported.
+
+For more information about this App, please check the docs on the TrueCharts [website](https://truecharts.org/charts/incubator/)
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)**
+
+
+## Support
+
+- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro).
+- See the [Website](https://truecharts.org)
+- Check our [Discord](https://discord.gg/tVsPTHWTtr)
+- Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
+
+---
+
+## Sponsor TrueCharts
+
+TrueCharts can only exist due to the incredible effort of our staff.
+Please consider making a [donation](https://truecharts.org/sponsor) or contributing back to the project any way you can!
+
+*All Rights Reserved - The TrueCharts Project*
diff --git a/incubator/kaizoku/0.1.0/app-changelog.md b/incubator/kaizoku/0.1.0/app-changelog.md
new file mode 100644
index 00000000000..66c0b792af4
--- /dev/null
+++ b/incubator/kaizoku/0.1.0/app-changelog.md
@@ -0,0 +1,4 @@
+
+
+## [kaizoku-0.1.0](https://github.com/truecharts/charts/compare/kaizoku-0.0.1...kaizoku-0.1.0) (2023-08-30)
+
diff --git a/incubator/kaizoku/0.0.1/app-readme.md b/incubator/kaizoku/0.1.0/app-readme.md
similarity index 90%
rename from incubator/kaizoku/0.0.1/app-readme.md
rename to incubator/kaizoku/0.1.0/app-readme.md
index 602732d4a6b..42a059132aa 100644
--- a/incubator/kaizoku/0.0.1/app-readme.md
+++ b/incubator/kaizoku/0.1.0/app-readme.md
@@ -1,4 +1,4 @@
-Kaizoku is self-hosted manga downloader.
+A self-hosted manga downloader.
 
 This App is supplied by TrueCharts, for more information visit the manual: [https://truecharts.org/charts/incubator/kaizoku](https://truecharts.org/charts/incubator/kaizoku)
 
diff --git a/incubator/kaizoku/0.1.0/charts/common-14.0.3.tgz b/incubator/kaizoku/0.1.0/charts/common-14.0.3.tgz
new file mode 100644
index 00000000000..9dab2456ffc
Binary files /dev/null and b/incubator/kaizoku/0.1.0/charts/common-14.0.3.tgz differ
diff --git a/incubator/kaizoku/0.1.0/charts/redis-7.0.6.tgz b/incubator/kaizoku/0.1.0/charts/redis-7.0.6.tgz
new file mode 100644
index 00000000000..5a765707b05
Binary files /dev/null and b/incubator/kaizoku/0.1.0/charts/redis-7.0.6.tgz differ
diff --git a/incubator/kaizoku/0.0.1/ix_values.yaml b/incubator/kaizoku/0.1.0/ix_values.yaml
similarity index 91%
rename from incubator/kaizoku/0.0.1/ix_values.yaml
rename to incubator/kaizoku/0.1.0/ix_values.yaml
index 78e0c81de7c..3d79af581b7 100644
--- a/incubator/kaizoku/0.0.1/ix_values.yaml
+++ b/incubator/kaizoku/0.1.0/ix_values.yaml
@@ -26,13 +26,13 @@ workload:
             KAIZOKU_PORT: "{{ .Values.service.main.ports.main.port }}"
             DATABASE_URL:
               secretKeyRef:
-                name: kaizoku-secret
-                key: DATABASE_URL
+                name: cnpg-main-urls
+                key: std
             REDIS_HOST:
               secretKeyRef:
                 expandObjectName: false
                 name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}'
-                key: url
+                key: plainhost
             REDIS_PORT: 6379
 
 persistence:
diff --git a/incubator/kaizoku/0.0.1/questions.yaml b/incubator/kaizoku/0.1.0/questions.yaml
similarity index 100%
rename from incubator/kaizoku/0.0.1/questions.yaml
rename to incubator/kaizoku/0.1.0/questions.yaml
diff --git a/incubator/kaizoku/0.1.0/templates/NOTES.txt b/incubator/kaizoku/0.1.0/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/incubator/kaizoku/0.1.0/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/incubator/kaizoku/0.1.0/templates/common.yaml b/incubator/kaizoku/0.1.0/templates/common.yaml
new file mode 100644
index 00000000000..b51394e00a4
--- /dev/null
+++ b/incubator/kaizoku/0.1.0/templates/common.yaml
@@ -0,0 +1 @@
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/incubator/kaizoku/0.0.1/values.yaml b/incubator/kaizoku/0.1.0/values.yaml
similarity index 100%
rename from incubator/kaizoku/0.0.1/values.yaml
rename to incubator/kaizoku/0.1.0/values.yaml