diff --git a/charts/emby/2.0.2/.helmignore b/charts/emby/2.0.3/.helmignore
similarity index 100%
rename from charts/emby/2.0.2/.helmignore
rename to charts/emby/2.0.3/.helmignore
diff --git a/charts/emby/2.0.2/Chart.lock b/charts/emby/2.0.3/Chart.lock
similarity index 100%
rename from charts/emby/2.0.2/Chart.lock
rename to charts/emby/2.0.3/Chart.lock
diff --git a/charts/emby/2.0.2/Chart.yaml b/charts/emby/2.0.3/Chart.yaml
similarity index 97%
rename from charts/emby/2.0.2/Chart.yaml
rename to charts/emby/2.0.3/Chart.yaml
index dc4d7f5d71..fc7a224c2c 100644
--- a/charts/emby/2.0.2/Chart.yaml
+++ b/charts/emby/2.0.3/Chart.yaml
@@ -4,7 +4,7 @@ description: Emby is designed to help you manage your personal media library, su
 annotations:
   title: Emby Server
 type: application
-version: 2.0.2
+version: 2.0.3
 apiVersion: v2
 appVersion: 4.8.1.0
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/emby/2.0.2/README.md b/charts/emby/2.0.3/README.md
similarity index 100%
rename from charts/emby/2.0.2/README.md
rename to charts/emby/2.0.3/README.md
diff --git a/charts/emby/2.0.2/app-readme.md b/charts/emby/2.0.3/app-readme.md
similarity index 100%
rename from charts/emby/2.0.2/app-readme.md
rename to charts/emby/2.0.3/app-readme.md
diff --git a/charts/emby/2.0.2/charts/common-1.2.9.tgz b/charts/emby/2.0.3/charts/common-1.2.9.tgz
similarity index 100%
rename from charts/emby/2.0.2/charts/common-1.2.9.tgz
rename to charts/emby/2.0.3/charts/common-1.2.9.tgz
diff --git a/charts/emby/2.0.2/ci/basic-values.yaml b/charts/emby/2.0.3/ci/basic-values.yaml
similarity index 100%
rename from charts/emby/2.0.2/ci/basic-values.yaml
rename to charts/emby/2.0.3/ci/basic-values.yaml
diff --git a/charts/emby/2.0.2/ci/extra-values.yaml b/charts/emby/2.0.3/ci/extra-values.yaml
similarity index 100%
rename from charts/emby/2.0.2/ci/extra-values.yaml
rename to charts/emby/2.0.3/ci/extra-values.yaml
diff --git a/charts/emby/2.0.2/ci/hostNet-values.yaml b/charts/emby/2.0.3/ci/hostNet-values.yaml
similarity index 100%
rename from charts/emby/2.0.2/ci/hostNet-values.yaml
rename to charts/emby/2.0.3/ci/hostNet-values.yaml
diff --git a/charts/emby/2.0.2/ix_values.yaml b/charts/emby/2.0.3/ix_values.yaml
similarity index 100%
rename from charts/emby/2.0.2/ix_values.yaml
rename to charts/emby/2.0.3/ix_values.yaml
diff --git a/charts/emby/2.0.2/metadata.yaml b/charts/emby/2.0.3/metadata.yaml
similarity index 100%
rename from charts/emby/2.0.2/metadata.yaml
rename to charts/emby/2.0.3/metadata.yaml
diff --git a/charts/emby/2.0.2/migrations/migrate b/charts/emby/2.0.3/migrations/migrate
similarity index 96%
rename from charts/emby/2.0.2/migrations/migrate
rename to charts/emby/2.0.3/migrations/migrate
index 4377c6ea51..87d4239a3d 100755
--- a/charts/emby/2.0.2/migrations/migrate
+++ b/charts/emby/2.0.3/migrations/migrate
@@ -25,7 +25,7 @@ def migrate_common_lib(values):
     values.update({
         # Migrate Network
         'embyNetwork': {
-            'webPort': values['embyServerHttp']['port'],
+            'webPort': values['embyServerHttp']['port'] if values['hostNetwork'] else 9096,
             'hostNetwork': values['hostNetwork'],
         },
         # Migrate Resources
diff --git a/charts/emby/2.0.2/questions.yaml b/charts/emby/2.0.3/questions.yaml
similarity index 100%
rename from charts/emby/2.0.2/questions.yaml
rename to charts/emby/2.0.3/questions.yaml
diff --git a/charts/emby/2.0.2/templates/NOTES.txt b/charts/emby/2.0.3/templates/NOTES.txt
similarity index 100%
rename from charts/emby/2.0.2/templates/NOTES.txt
rename to charts/emby/2.0.3/templates/NOTES.txt
diff --git a/charts/emby/2.0.2/templates/_emby.tpl b/charts/emby/2.0.3/templates/_emby.tpl
similarity index 100%
rename from charts/emby/2.0.2/templates/_emby.tpl
rename to charts/emby/2.0.3/templates/_emby.tpl
diff --git a/charts/emby/2.0.2/templates/_migration.tpl b/charts/emby/2.0.3/templates/_migration.tpl
similarity index 100%
rename from charts/emby/2.0.2/templates/_migration.tpl
rename to charts/emby/2.0.3/templates/_migration.tpl
diff --git a/charts/emby/2.0.2/templates/_persistance.tpl b/charts/emby/2.0.3/templates/_persistance.tpl
similarity index 100%
rename from charts/emby/2.0.2/templates/_persistance.tpl
rename to charts/emby/2.0.3/templates/_persistance.tpl
diff --git a/charts/emby/2.0.2/templates/_portal.tpl b/charts/emby/2.0.3/templates/_portal.tpl
similarity index 100%
rename from charts/emby/2.0.2/templates/_portal.tpl
rename to charts/emby/2.0.3/templates/_portal.tpl
diff --git a/charts/emby/2.0.2/templates/_service.tpl b/charts/emby/2.0.3/templates/_service.tpl
similarity index 100%
rename from charts/emby/2.0.2/templates/_service.tpl
rename to charts/emby/2.0.3/templates/_service.tpl
diff --git a/charts/emby/2.0.2/templates/common.yaml b/charts/emby/2.0.3/templates/common.yaml
similarity index 100%
rename from charts/emby/2.0.2/templates/common.yaml
rename to charts/emby/2.0.3/templates/common.yaml
diff --git a/charts/emby/2.0.2/to_keep_versions.md b/charts/emby/2.0.3/to_keep_versions.md
similarity index 100%
rename from charts/emby/2.0.2/to_keep_versions.md
rename to charts/emby/2.0.3/to_keep_versions.md
diff --git a/charts/pihole/2.0.5/.helmignore b/charts/pihole/2.0.6/.helmignore
similarity index 100%
rename from charts/pihole/2.0.5/.helmignore
rename to charts/pihole/2.0.6/.helmignore
diff --git a/charts/pihole/2.0.5/Chart.lock b/charts/pihole/2.0.6/Chart.lock
similarity index 100%
rename from charts/pihole/2.0.5/Chart.lock
rename to charts/pihole/2.0.6/Chart.lock
diff --git a/charts/pihole/2.0.5/Chart.yaml b/charts/pihole/2.0.6/Chart.yaml
similarity index 97%
rename from charts/pihole/2.0.5/Chart.yaml
rename to charts/pihole/2.0.6/Chart.yaml
index 34112e8cfc..7a34c7abec 100644
--- a/charts/pihole/2.0.5/Chart.yaml
+++ b/charts/pihole/2.0.6/Chart.yaml
@@ -3,7 +3,7 @@ description: DNS and Ad-filtering for your network.
 annotations:
   title: Pi-hole
 type: application
-version: 2.0.5
+version: 2.0.6
 apiVersion: v2
 appVersion: 2024.02.0
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/pihole/2.0.5/README.md b/charts/pihole/2.0.6/README.md
similarity index 100%
rename from charts/pihole/2.0.5/README.md
rename to charts/pihole/2.0.6/README.md
diff --git a/charts/pihole/2.0.5/app-readme.md b/charts/pihole/2.0.6/app-readme.md
similarity index 100%
rename from charts/pihole/2.0.5/app-readme.md
rename to charts/pihole/2.0.6/app-readme.md
diff --git a/charts/pihole/2.0.5/charts/common-1.2.9.tgz b/charts/pihole/2.0.6/charts/common-1.2.9.tgz
similarity index 100%
rename from charts/pihole/2.0.5/charts/common-1.2.9.tgz
rename to charts/pihole/2.0.6/charts/common-1.2.9.tgz
diff --git a/charts/pihole/2.0.5/ci/basic-values.yaml b/charts/pihole/2.0.6/ci/basic-values.yaml
similarity index 100%
rename from charts/pihole/2.0.5/ci/basic-values.yaml
rename to charts/pihole/2.0.6/ci/basic-values.yaml
diff --git a/charts/pihole/2.0.5/ci/nodhcp-values.yaml b/charts/pihole/2.0.6/ci/nodhcp-values.yaml
similarity index 100%
rename from charts/pihole/2.0.5/ci/nodhcp-values.yaml
rename to charts/pihole/2.0.6/ci/nodhcp-values.yaml
diff --git a/charts/pihole/2.0.5/ix_values.yaml b/charts/pihole/2.0.6/ix_values.yaml
similarity index 100%
rename from charts/pihole/2.0.5/ix_values.yaml
rename to charts/pihole/2.0.6/ix_values.yaml
diff --git a/charts/pihole/2.0.5/metadata.yaml b/charts/pihole/2.0.6/metadata.yaml
similarity index 100%
rename from charts/pihole/2.0.5/metadata.yaml
rename to charts/pihole/2.0.6/metadata.yaml
diff --git a/charts/pihole/2.0.5/migrations/migrate b/charts/pihole/2.0.6/migrations/migrate
similarity index 100%
rename from charts/pihole/2.0.5/migrations/migrate
rename to charts/pihole/2.0.6/migrations/migrate
diff --git a/charts/pihole/2.0.5/questions.yaml b/charts/pihole/2.0.6/questions.yaml
similarity index 100%
rename from charts/pihole/2.0.5/questions.yaml
rename to charts/pihole/2.0.6/questions.yaml
diff --git a/charts/pihole/2.0.5/templates/NOTES.txt b/charts/pihole/2.0.6/templates/NOTES.txt
similarity index 100%
rename from charts/pihole/2.0.5/templates/NOTES.txt
rename to charts/pihole/2.0.6/templates/NOTES.txt
diff --git a/charts/pihole/2.0.5/templates/_migration.tpl b/charts/pihole/2.0.6/templates/_migration.tpl
similarity index 100%
rename from charts/pihole/2.0.5/templates/_migration.tpl
rename to charts/pihole/2.0.6/templates/_migration.tpl
diff --git a/charts/pihole/2.0.5/templates/_persistence.tpl b/charts/pihole/2.0.6/templates/_persistence.tpl
similarity index 100%
rename from charts/pihole/2.0.5/templates/_persistence.tpl
rename to charts/pihole/2.0.6/templates/_persistence.tpl
diff --git a/charts/pihole/2.0.5/templates/_pihole.tpl b/charts/pihole/2.0.6/templates/_pihole.tpl
similarity index 96%
rename from charts/pihole/2.0.5/templates/_pihole.tpl
rename to charts/pihole/2.0.6/templates/_pihole.tpl
index e8d484279a..83705100c3 100644
--- a/charts/pihole/2.0.5/templates/_pihole.tpl
+++ b/charts/pihole/2.0.6/templates/_pihole.tpl
@@ -32,7 +32,7 @@ workload:
                 - KILL
           env:
             WEB_PORT: {{ .Values.piholeNetwork.webPort }}
-            WEBPASSWORD: {{ .Values.piholeConfig.webPassword }}
+            WEBPASSWORD: {{ .Values.piholeConfig.webPassword | quote }}
             {{- if .Values.piholeNetwork.dhcp.enabled }}
             DHCP_ACTIVE: "true"
             DHCP_START: {{ .Values.piholeNetwork.dhcp.start }}
diff --git a/charts/pihole/2.0.5/templates/_portal.tpl b/charts/pihole/2.0.6/templates/_portal.tpl
similarity index 100%
rename from charts/pihole/2.0.5/templates/_portal.tpl
rename to charts/pihole/2.0.6/templates/_portal.tpl
diff --git a/charts/pihole/2.0.5/templates/_service.tpl b/charts/pihole/2.0.6/templates/_service.tpl
similarity index 100%
rename from charts/pihole/2.0.5/templates/_service.tpl
rename to charts/pihole/2.0.6/templates/_service.tpl
diff --git a/charts/pihole/2.0.5/templates/common.yaml b/charts/pihole/2.0.6/templates/common.yaml
similarity index 100%
rename from charts/pihole/2.0.5/templates/common.yaml
rename to charts/pihole/2.0.6/templates/common.yaml
diff --git a/charts/pihole/2.0.5/to_keep_versions.md b/charts/pihole/2.0.6/to_keep_versions.md
similarity index 100%
rename from charts/pihole/2.0.5/to_keep_versions.md
rename to charts/pihole/2.0.6/to_keep_versions.md