diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 09100f07f99..7fc7fecfadb 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -211,15 +211,21 @@
       "versioning": "regex:^(?<major>14)\\.(?<minor>\\d+)\\.(?<patch>\\d+)$",
       "matchPackageNames": ["tccr.io/tccr/postgresql"],
     },
+    {
+      "matchDatasources": ["docker"],
+      "versioning": "regex:^18-jammy-(full|lite)-v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)$",
+      "matchPackageNames": ["koush/scrypted"],
+      "groupName": "scrypted"
+    },
     {
       "matchDatasources": ["docker"],
       "versioning": "regex:^v(?<major>\\d{2})(?<minor>\\d{2})(?<patch>\\d{2})$",
-      "matchPackageNames": ["tccr.io/tccr/photoprism"],
+      "matchPackageNames": ["photoprism"],
     },
     {
       "matchDatasources": ["docker"],
       "versioning": "regex:^v(?<major>\\d{4})-(?<minor>\\d{2})$",
-      "matchPackageNames": ["tccr.io/tccr/rss-bridge"],
+      "matchPackageNames": ["rssbridge/rss-bridge"],
     },
     {
       "matchDatasources": ["docker"],
@@ -227,12 +233,6 @@
       "matchPackagePrefixes": ["jupyter"],
       "groupName": "jupyter",
     },
-    {
-      "matchDatasources": ["docker"],
-      "versioning": "regex:^(?<major>\\d{1})(?<minor>\\d{1})(?<patch>\\d{2})$",
-      "matchPackagePrefixes": ["tccr.io/tccr/jitsi"],
-      "groupName": "jitsi",
-    },
     {
       "matchDatasources": ["docker"],
       "matchPackagePrefixes": ["altran1502/immich"],
@@ -270,7 +270,7 @@
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/zabbix"],
+      "matchPackagePrefixes": ["zabbix/zabbix"],
       "groupName": "zabbix",
     },
     {
@@ -280,7 +280,7 @@
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/ml-workspace"],
+      "matchPackagePrefixes": ["mltooling/ml-workspace"],
       "groupName": "ml-workspace",
     },
     {
@@ -300,17 +300,12 @@
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/mealie"],
-      "groupName": "mealie",
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/librephotos"],
+      "matchPackagePrefixes": ["reallibrephotos/librephotos"],
       "groupName": "librephotos",
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/kitchenowl"],
+      "matchPackagePrefixes": ["tombursch/kitchenowl"],
       "groupName": "kitchenowl",
     },
     {
@@ -320,42 +315,27 @@
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/lama-cleaner"],
+      "matchPackagePrefixes": ["cwq1913/lama-cleaner"],
       "groupName": "lama-cleaner",
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/rickroll"],
-      "groupName": "rickroll",
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/scrypted"],
-      "groupName": "scrypted",
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/docspell"],
+      "matchPackagePrefixes": ["docspell/"],
       "groupName": "docspell",
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/restreamer"],
+      "matchPackagePrefixes": ["datarhei/restreamer"],
       "groupName": "restreamer",
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/penpot"],
+      "matchPackagePrefixes": ["penpotapp/"],
       "groupName": "penpot",
     },
     {
       "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/rdesktop"],
-      "groupName": "rdesktop",
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchPackagePrefixes": ["tccr.io/tccr/ersatztv"],
+      "matchPackagePrefixes": ["jasongdove/ersatztv"],
       "groupName": "ersatztv",
     },
     // matchPackagePatterns
@@ -387,6 +367,7 @@
       "matchDatasources": ["docker"],
       "versioning": "regex:^stable-(?<major>\\d{1})(?<minor>\\d{1})(?<patch>\\d{2}).*$",
       "matchPackagePatterns": ["^jitsi\\/.*$"],
+      "groupName": "jitsi",
       "automerge": true,
     },
     {
diff --git a/charts/stable/scrypted/Chart.yaml b/charts/stable/scrypted/Chart.yaml
index 5276cfcb09e..75cae76ef68 100644
--- a/charts/stable/scrypted/Chart.yaml
+++ b/charts/stable/scrypted/Chart.yaml
@@ -7,7 +7,7 @@ annotations:
   truecharts.org/min_helm_version: "3.12"
   truecharts.org/train: stable
 apiVersion: v2
-appVersion: "18"
+appVersion: "18.0.83"
 dependencies:
   - name: common
     version: 17.2.22
@@ -34,4 +34,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/scrypted
   - https://hub.docker.com/r/koush/scrypted
 type: application
-version: 3.1.6
+version: 3.1.7
diff --git a/charts/stable/scrypted/values.yaml b/charts/stable/scrypted/values.yaml
index cf95ce9930c..53f60200188 100644
--- a/charts/stable/scrypted/values.yaml
+++ b/charts/stable/scrypted/values.yaml
@@ -1,10 +1,10 @@
 image:
   repository: koush/scrypted
-  tag: 18-jammy-full-v0.68.0@sha256:c95bd5a65edd8ba132fd9425c7052ea88bd82936afc50391e21d66a671c48329
+  tag: 18-jammy-full-v0.83.0@sha256:9903cce8639c329b3ead01e0d796b28376d91723aa696a0a0914c9f35cbfe3cd
   pullPolicy: Always
 liteImage:
   repository: koush/scrypted
-  tag: 18-jammy-lite-v0.68.0@sha256:adaed0c9d08f2b4ccfb1369548c65104787e1b8db04a550e6ea7909145d400bc
+  tag: 18-jammy-lite-v0.83.0@sha256:adaed0c9d08f2b4ccfb1369548c65104787e1b8db04a550e6ea7909145d400bc
   pullPolicy: Always
 
 securityContext: