diff --git a/community/gitea/1.1.20/Chart.lock b/community/gitea/1.1.21/Chart.lock
similarity index 100%
rename from community/gitea/1.1.20/Chart.lock
rename to community/gitea/1.1.21/Chart.lock
diff --git a/community/gitea/1.1.20/Chart.yaml b/community/gitea/1.1.21/Chart.yaml
similarity index 97%
rename from community/gitea/1.1.20/Chart.yaml
rename to community/gitea/1.1.21/Chart.yaml
index f2c9fbd455..475ab6bd25 100644
--- a/community/gitea/1.1.20/Chart.yaml
+++ b/community/gitea/1.1.21/Chart.yaml
@@ -3,7 +3,7 @@ description: Gitea - Git with a cup of tea
 annotations:
   title: Gitea
 type: application
-version: 1.1.20
+version: 1.1.21
 apiVersion: v2
 appVersion: 1.22.0
 kubeVersion: '>=1.16.0-0'
diff --git a/community/gitea/1.1.20/README.md b/community/gitea/1.1.21/README.md
similarity index 100%
rename from community/gitea/1.1.20/README.md
rename to community/gitea/1.1.21/README.md
diff --git a/community/gitea/1.1.20/app-readme.md b/community/gitea/1.1.21/app-readme.md
similarity index 100%
rename from community/gitea/1.1.20/app-readme.md
rename to community/gitea/1.1.21/app-readme.md
diff --git a/community/gitea/1.1.20/charts/common-1.2.9.tgz b/community/gitea/1.1.21/charts/common-1.2.9.tgz
similarity index 100%
rename from community/gitea/1.1.20/charts/common-1.2.9.tgz
rename to community/gitea/1.1.21/charts/common-1.2.9.tgz
diff --git a/community/gitea/1.1.20/ci/basic-values.yaml b/community/gitea/1.1.21/ci/basic-values.yaml
similarity index 90%
rename from community/gitea/1.1.20/ci/basic-values.yaml
rename to community/gitea/1.1.21/ci/basic-values.yaml
index 5a53f8db0c..68bcb88895 100644
--- a/community/gitea/1.1.20/ci/basic-values.yaml
+++ b/community/gitea/1.1.21/ci/basic-values.yaml
@@ -13,3 +13,4 @@ giteaStorage:
 
 giteaNetwork:
   rootURL: http://localhost:30000
+  externalSshPort: 22
diff --git a/community/gitea/1.1.20/ci/https-values.yaml b/community/gitea/1.1.21/ci/https-values.yaml
similarity index 100%
rename from community/gitea/1.1.20/ci/https-values.yaml
rename to community/gitea/1.1.21/ci/https-values.yaml
diff --git a/community/gitea/1.1.20/ix_values.yaml b/community/gitea/1.1.21/ix_values.yaml
similarity index 100%
rename from community/gitea/1.1.20/ix_values.yaml
rename to community/gitea/1.1.21/ix_values.yaml
diff --git a/community/gitea/1.1.20/metadata.yaml b/community/gitea/1.1.21/metadata.yaml
similarity index 100%
rename from community/gitea/1.1.20/metadata.yaml
rename to community/gitea/1.1.21/metadata.yaml
diff --git a/community/gitea/1.1.20/migrations/migrate b/community/gitea/1.1.21/migrations/migrate
similarity index 100%
rename from community/gitea/1.1.20/migrations/migrate
rename to community/gitea/1.1.21/migrations/migrate
diff --git a/community/gitea/1.1.20/questions.yaml b/community/gitea/1.1.21/questions.yaml
similarity index 98%
rename from community/gitea/1.1.20/questions.yaml
rename to community/gitea/1.1.21/questions.yaml
index da30045f3b..987d5ae074 100644
--- a/community/gitea/1.1.20/questions.yaml
+++ b/community/gitea/1.1.21/questions.yaml
@@ -21,7 +21,6 @@ portals:
     path: "$kubernetes-resource_configmap_portal_path"
 
 questions:
-
   - variable: giteaConfig
     label: ""
     group: Gitea Configuration
@@ -105,6 +104,17 @@ questions:
             min: 9000
             max: 65535
             required: true
+        - variable: externalSshPort
+          label: External SSH Port
+          description: |
+            The ssh port that Gitea will be available at externally.</br>
+            Leave empty to use the same port as the ssh port.
+          schema:
+            type: int
+            "null": true
+            default: null
+            min: 9000
+            max: 65535
         - variable: hostNetwork
           label: Host Network
           description: |
diff --git a/community/gitea/1.1.20/templates/NOTES.txt b/community/gitea/1.1.21/templates/NOTES.txt
similarity index 100%
rename from community/gitea/1.1.20/templates/NOTES.txt
rename to community/gitea/1.1.21/templates/NOTES.txt
diff --git a/community/gitea/1.1.20/templates/_configuration.tpl b/community/gitea/1.1.21/templates/_configuration.tpl
similarity index 94%
rename from community/gitea/1.1.20/templates/_configuration.tpl
rename to community/gitea/1.1.21/templates/_configuration.tpl
index 1a3265cf4a..bdaeb6b47f 100644
--- a/community/gitea/1.1.20/templates/_configuration.tpl
+++ b/community/gitea/1.1.21/templates/_configuration.tpl
@@ -45,7 +45,7 @@ configmap:
     data:
       {{ $protocol := "http" }}
       GITEA__server__HTTP_PORT: {{ .Values.giteaNetwork.webPort | quote }}
-      GITEA__server__SSH_PORT: {{ .Values.giteaNetwork.sshPort | quote }}
+      GITEA__server__SSH_PORT: {{ .Values.giteaNetwork.externalSshPort | default .Values.giteaNetwork.sshPort | quote }}
       GITEA__server__SSH_LISTEN_PORT: {{ .Values.giteaNetwork.sshPort | quote }}
       GITEA__server__ROOT_URL: {{ .Values.giteaNetwork.rootURL | quote }}
       {{ if .Values.giteaNetwork.certificateID }}
diff --git a/community/gitea/1.1.20/templates/_gitea.tpl b/community/gitea/1.1.21/templates/_gitea.tpl
similarity index 100%
rename from community/gitea/1.1.20/templates/_gitea.tpl
rename to community/gitea/1.1.21/templates/_gitea.tpl
diff --git a/community/gitea/1.1.20/templates/_portal.tpl b/community/gitea/1.1.21/templates/_portal.tpl
similarity index 100%
rename from community/gitea/1.1.20/templates/_portal.tpl
rename to community/gitea/1.1.21/templates/_portal.tpl
diff --git a/community/gitea/1.1.20/templates/_postgres.tpl b/community/gitea/1.1.21/templates/_postgres.tpl
similarity index 100%
rename from community/gitea/1.1.20/templates/_postgres.tpl
rename to community/gitea/1.1.21/templates/_postgres.tpl
diff --git a/community/gitea/1.1.20/templates/common.yaml b/community/gitea/1.1.21/templates/common.yaml
similarity index 100%
rename from community/gitea/1.1.20/templates/common.yaml
rename to community/gitea/1.1.21/templates/common.yaml
diff --git a/community/tdarr/1.2.5/Chart.lock b/community/tdarr/1.2.6/Chart.lock
similarity index 100%
rename from community/tdarr/1.2.5/Chart.lock
rename to community/tdarr/1.2.6/Chart.lock
diff --git a/community/tdarr/1.2.5/Chart.yaml b/community/tdarr/1.2.6/Chart.yaml
similarity index 97%
rename from community/tdarr/1.2.5/Chart.yaml
rename to community/tdarr/1.2.6/Chart.yaml
index e02d38635c..551415bf63 100644
--- a/community/tdarr/1.2.5/Chart.yaml
+++ b/community/tdarr/1.2.6/Chart.yaml
@@ -3,7 +3,7 @@ description: Tdarr is a Distributed Transcoding System
 annotations:
   title: Tdarr
 type: application
-version: 1.2.5
+version: 1.2.6
 apiVersion: v2
 appVersion: 2.17.01
 kubeVersion: '>=1.16.0-0'
diff --git a/community/tdarr/1.2.5/README.md b/community/tdarr/1.2.6/README.md
similarity index 100%
rename from community/tdarr/1.2.5/README.md
rename to community/tdarr/1.2.6/README.md
diff --git a/community/tdarr/1.2.5/app-readme.md b/community/tdarr/1.2.6/app-readme.md
similarity index 100%
rename from community/tdarr/1.2.5/app-readme.md
rename to community/tdarr/1.2.6/app-readme.md
diff --git a/community/tdarr/1.2.5/charts/common-1.2.9.tgz b/community/tdarr/1.2.6/charts/common-1.2.9.tgz
similarity index 100%
rename from community/tdarr/1.2.5/charts/common-1.2.9.tgz
rename to community/tdarr/1.2.6/charts/common-1.2.9.tgz
diff --git a/community/tdarr/1.2.5/ci/basic-values.yaml b/community/tdarr/1.2.6/ci/basic-values.yaml
similarity index 100%
rename from community/tdarr/1.2.5/ci/basic-values.yaml
rename to community/tdarr/1.2.6/ci/basic-values.yaml
diff --git a/community/tdarr/1.2.5/ci/no-internal-node-values.yaml b/community/tdarr/1.2.6/ci/no-internal-node-values.yaml
similarity index 100%
rename from community/tdarr/1.2.5/ci/no-internal-node-values.yaml
rename to community/tdarr/1.2.6/ci/no-internal-node-values.yaml
diff --git a/community/tdarr/1.2.5/ix_values.yaml b/community/tdarr/1.2.6/ix_values.yaml
similarity index 100%
rename from community/tdarr/1.2.5/ix_values.yaml
rename to community/tdarr/1.2.6/ix_values.yaml
diff --git a/community/tdarr/1.2.5/metadata.yaml b/community/tdarr/1.2.6/metadata.yaml
similarity index 100%
rename from community/tdarr/1.2.5/metadata.yaml
rename to community/tdarr/1.2.6/metadata.yaml
diff --git a/community/tdarr/1.2.5/migrations/migrate b/community/tdarr/1.2.6/migrations/migrate
similarity index 100%
rename from community/tdarr/1.2.5/migrations/migrate
rename to community/tdarr/1.2.6/migrations/migrate
diff --git a/community/tdarr/1.2.5/questions.yaml b/community/tdarr/1.2.6/questions.yaml
similarity index 100%
rename from community/tdarr/1.2.5/questions.yaml
rename to community/tdarr/1.2.6/questions.yaml
diff --git a/community/tdarr/1.2.5/templates/NOTES.txt b/community/tdarr/1.2.6/templates/NOTES.txt
similarity index 100%
rename from community/tdarr/1.2.5/templates/NOTES.txt
rename to community/tdarr/1.2.6/templates/NOTES.txt
diff --git a/community/tdarr/1.2.5/templates/_portal.tpl b/community/tdarr/1.2.6/templates/_portal.tpl
similarity index 100%
rename from community/tdarr/1.2.5/templates/_portal.tpl
rename to community/tdarr/1.2.6/templates/_portal.tpl
diff --git a/community/tdarr/1.2.5/templates/_tdarr.tpl b/community/tdarr/1.2.6/templates/_tdarr.tpl
similarity index 100%
rename from community/tdarr/1.2.5/templates/_tdarr.tpl
rename to community/tdarr/1.2.6/templates/_tdarr.tpl
diff --git a/community/tdarr/1.2.5/templates/common.yaml b/community/tdarr/1.2.6/templates/common.yaml
similarity index 100%
rename from community/tdarr/1.2.5/templates/common.yaml
rename to community/tdarr/1.2.6/templates/common.yaml