diff --git a/charts/emby/1.0.16/Chart.lock b/charts/emby/1.0.16/Chart.lock
deleted file mode 100644
index f64cd228a3..0000000000
--- a/charts/emby/1.0.16/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
-generated: "2022-07-28T22:31:02.894743529+05:00"
diff --git a/charts/emby/1.0.16/Chart.yaml b/charts/emby/1.0.16/Chart.yaml
deleted file mode 100644
index 7507126c2c..0000000000
--- a/charts/emby/1.0.16/Chart.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v2
-appVersion: 4.7.11.0
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-description: Emby Server
-home: https://emby.media/
-icon: https://images-na.ssl-images-amazon.com/images/I/41NwssJC1iL.png
-keywords:
-- emby
-- media
-name: emby
-sources:
-- https://hub.docker.com/r/emby/embyserver
-version: 1.0.16
diff --git a/charts/emby/1.0.16/charts/common-2207.0.0.tgz b/charts/emby/1.0.16/charts/common-2207.0.0.tgz
deleted file mode 100644
index 2adf94b438..0000000000
Binary files a/charts/emby/1.0.16/charts/common-2207.0.0.tgz and /dev/null differ
diff --git a/charts/emby/1.0.16/requirements.lock b/charts/emby/1.0.16/requirements.lock
deleted file mode 100644
index 77e599c9ce..0000000000
--- a/charts/emby/1.0.16/requirements.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0
-generated: "2021-12-06T21:24:36.674776+05:00"
diff --git a/charts/emby/1.0.16/templates/tests/deployment-check.yaml b/charts/emby/1.0.16/templates/tests/deployment-check.yaml
deleted file mode 100644
index 4c2eef4036..0000000000
--- a/charts/emby/1.0.16/templates/tests/deployment-check.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- $serviceName := (include "common.names.fullname" .) -}}
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ .Release.Name }}-emby-test"
-  labels:
-    app: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-    containers:
-      - name: test-curl
-        image: alpine/curl
-        imagePullPolicy: "IfNotPresent"
-        command:
-          - /bin/sh
-          - -ec
-          - |
-            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}-tcp:32496/emby/System/Ping
-    restartPolicy: Never
diff --git a/charts/emby/1.0.16/.helmignore b/library/ix-dev/charts/emby/.helmignore
similarity index 100%
rename from charts/emby/1.0.16/.helmignore
rename to library/ix-dev/charts/emby/.helmignore
diff --git a/library/ix-dev/charts/emby/Chart.lock b/library/ix-dev/charts/emby/Chart.lock
new file mode 100644
index 0000000000..b20dbb733c
--- /dev/null
+++ b/library/ix-dev/charts/emby/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../common/2207.0.0
+  version: 2207.0.0
+digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37
+generated: "2023-03-21T15:08:12.743996333Z"
diff --git a/library/ix-dev/charts/emby/Chart.yaml b/library/ix-dev/charts/emby/Chart.yaml
new file mode 100644
index 0000000000..969a540b71
--- /dev/null
+++ b/library/ix-dev/charts/emby/Chart.yaml
@@ -0,0 +1,23 @@
+name: emby
+description: Emby Server
+annotations:
+  title: Emby Server
+type: application
+version: 1.0.17
+apiVersion: v2
+appVersion: '4.7.11.0'
+kubeVersion: '>=1.16.0-0'
+maintainers:
+  - name: truenas
+    url: https://www.truenas.com/
+dependencies:
+  - name: common
+    repository: file://../../../common/2207.0.0
+    version: 2207.0.0
+home: https://emby.media/
+icon: https://images-na.ssl-images-amazon.com/images/I/41NwssJC1iL.png
+sources:
+  - https://hub.docker.com/r/emby/embyserver
+keywords:
+  - emby
+  - media
diff --git a/charts/emby/1.0.16/README.md b/library/ix-dev/charts/emby/README.md
similarity index 100%
rename from charts/emby/1.0.16/README.md
rename to library/ix-dev/charts/emby/README.md
diff --git a/charts/emby/1.0.16/app-readme.md b/library/ix-dev/charts/emby/app-readme.md
similarity index 100%
rename from charts/emby/1.0.16/app-readme.md
rename to library/ix-dev/charts/emby/app-readme.md
diff --git a/library/ix-dev/charts/emby/charts/common-2207.0.0.tgz b/library/ix-dev/charts/emby/charts/common-2207.0.0.tgz
new file mode 100644
index 0000000000..e414925f3b
Binary files /dev/null and b/library/ix-dev/charts/emby/charts/common-2207.0.0.tgz differ
diff --git a/charts/emby/1.0.16/test_values.yaml b/library/ix-dev/charts/emby/ci/test-values.yaml
similarity index 79%
rename from charts/emby/1.0.16/test_values.yaml
rename to library/ix-dev/charts/emby/ci/test-values.yaml
index fe39431780..9c46592c7d 100644
--- a/charts/emby/1.0.16/test_values.yaml
+++ b/library/ix-dev/charts/emby/ci/test-values.yaml
@@ -12,8 +12,4 @@ extraAppVolumeMounts:
   readOnly: true
 gpuConfiguration: {}
 hostNetwork: false
-image:
-  pullPolicy: IfNotPresent
-  repository: emby/embyserver
-  tag: 4.7.11.0
 updateStrategy: Recreate
diff --git a/charts/emby/item.yaml b/library/ix-dev/charts/emby/item.yaml
similarity index 100%
rename from charts/emby/item.yaml
rename to library/ix-dev/charts/emby/item.yaml
diff --git a/charts/emby/1.0.16/questions.yaml b/library/ix-dev/charts/emby/questions.yaml
similarity index 100%
rename from charts/emby/1.0.16/questions.yaml
rename to library/ix-dev/charts/emby/questions.yaml
diff --git a/charts/emby/1.0.16/templates/NOTES.txt b/library/ix-dev/charts/emby/templates/NOTES.txt
similarity index 100%
rename from charts/emby/1.0.16/templates/NOTES.txt
rename to library/ix-dev/charts/emby/templates/NOTES.txt
diff --git a/charts/emby/1.0.16/templates/deployment.yaml b/library/ix-dev/charts/emby/templates/deployment.yaml
similarity index 87%
rename from charts/emby/1.0.16/templates/deployment.yaml
rename to library/ix-dev/charts/emby/templates/deployment.yaml
index e15f1e1e4a..acf5df3e81 100644
--- a/charts/emby/1.0.16/templates/deployment.yaml
+++ b/library/ix-dev/charts/emby/templates/deployment.yaml
@@ -48,21 +48,29 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
             httpGet:
               path: /emby/System/Ping
               port: 8096
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            timeoutSeconds: 5
             failureThreshold: 5
-            periodSeconds: 15
+            successThreshold: 2
           livenessProbe:
             httpGet:
               path: /emby/System/Ping
               port: 8096
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            timeoutSeconds: 5
             failureThreshold: 5
-            periodSeconds: 15
+            successThreshold: 1
           startupProbe:
             httpGet:
               path: /emby/System/Ping
               port: 8096
-            initialDelaySeconds: 5
-            failureThreshold: 40
-            periodSeconds: 15
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            timeoutSeconds: 2
+            failureThreshold: 60
+            successThreshold: 1
       volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
         {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
         - name: extrappvolume-{{ $index }}
diff --git a/charts/emby/1.0.16/templates/portal.tpl b/library/ix-dev/charts/emby/templates/portal.tpl
similarity index 100%
rename from charts/emby/1.0.16/templates/portal.tpl
rename to library/ix-dev/charts/emby/templates/portal.tpl
diff --git a/charts/emby/1.0.16/templates/service-tcp.yaml b/library/ix-dev/charts/emby/templates/service-tcp.yaml
similarity index 100%
rename from charts/emby/1.0.16/templates/service-tcp.yaml
rename to library/ix-dev/charts/emby/templates/service-tcp.yaml
diff --git a/charts/emby/1.0.16/templates/service-udp.yaml b/library/ix-dev/charts/emby/templates/service-udp.yaml
similarity index 100%
rename from charts/emby/1.0.16/templates/service-udp.yaml
rename to library/ix-dev/charts/emby/templates/service-udp.yaml
diff --git a/charts/emby/upgrade_info.json b/library/ix-dev/charts/emby/upgrade_info.json
similarity index 100%
rename from charts/emby/upgrade_info.json
rename to library/ix-dev/charts/emby/upgrade_info.json
diff --git a/charts/emby/upgrade_strategy b/library/ix-dev/charts/emby/upgrade_strategy
similarity index 100%
rename from charts/emby/upgrade_strategy
rename to library/ix-dev/charts/emby/upgrade_strategy
diff --git a/charts/emby/1.0.16/ix_values.yaml b/library/ix-dev/charts/emby/values.yaml
similarity index 100%
rename from charts/emby/1.0.16/ix_values.yaml
rename to library/ix-dev/charts/emby/values.yaml