diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index b5d15a3b542..1fccb157591 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -33,15 +33,15 @@ sources:
   - https://ghcr.io/tensorchord/cloudnative-pgvecto.rs
   - https://ghcr.io/tensorchord/cloudnative-vectorchord
   - https://ghcr.io/traefik/whoami
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/code-server
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/go-yq
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/kubectl
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/mariadb-client
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/mongosh
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/postgresql-client
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/scratch
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/ubuntu
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/valkey-tools
+  - https://github.com/trueforge-org/containers/tree/main/apps/code-server
+  - https://github.com/trueforge-org/containers/tree/main/apps/go-yq
+  - https://github.com/trueforge-org/containers/tree/main/apps/kubectl
+  - https://github.com/trueforge-org/containers/tree/main/apps/mariadb-client
+  - https://github.com/trueforge-org/containers/tree/main/apps/mongosh
+  - https://github.com/trueforge-org/containers/tree/main/apps/postgresql-client
+  - https://github.com/trueforge-org/containers/tree/main/apps/scratch
+  - https://github.com/trueforge-org/containers/tree/main/apps/ubuntu
+  - https://github.com/trueforge-org/containers/tree/main/apps/valkey-tools
   - https://github.com/trueforge-org/truecharts/tree/master/charts/library/common
   - https://hub.docker.com/_/
 type: library
diff --git a/charts/stable/adguardhome-sync/Chart.yaml b/charts/stable/adguardhome-sync/Chart.yaml
index 25fea44f780..243efb49e42 100644
--- a/charts/stable/adguardhome-sync/Chart.yaml
+++ b/charts/stable/adguardhome-sync/Chart.yaml
@@ -33,7 +33,7 @@ maintainers:
 name: adguardhome-sync
 sources:
   - https://github.com/bakito/adguardhome-sync/
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/adguardhome-sync
+  - https://github.com/trueforge-org/containers/tree/main/apps/adguardhome-sync
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/adguardhome-sync
 type: application
 version: 9.15.18
diff --git a/charts/stable/airsonic-advanced/Chart.yaml b/charts/stable/airsonic-advanced/Chart.yaml
index 70cd10ca6ae..34794c29fc7 100644
--- a/charts/stable/airsonic-advanced/Chart.yaml
+++ b/charts/stable/airsonic-advanced/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
 name: airsonic-advanced
 sources:
   - https://github.com/airsonic/airsonic-advanced
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/airsonic-advanced
+  - https://github.com/trueforge-org/containers/tree/main/apps/airsonic-advanced
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/airsonic-advanced
 type: application
 version: 16.14.20
diff --git a/charts/stable/autoscan/Chart.yaml b/charts/stable/autoscan/Chart.yaml
index 96652bcfcb8..c863c45701d 100644
--- a/charts/stable/autoscan/Chart.yaml
+++ b/charts/stable/autoscan/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
     url: https://trueforge.org
 name: autoscan
 sources:
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/autoscan
+  - https://github.com/trueforge-org/containers/tree/main/apps/autoscan
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/autoscan
   - https://hotio.dev/containers/autoscan
 type: application
diff --git a/charts/stable/bazarr/Chart.yaml b/charts/stable/bazarr/Chart.yaml
index 6e61b9fd2b7..5c839197cd0 100644
--- a/charts/stable/bazarr/Chart.yaml
+++ b/charts/stable/bazarr/Chart.yaml
@@ -38,7 +38,7 @@ name: bazarr
 sources:
   - https://ghcr.io/onedr0p/exportarr
   - https://github.com/morpheus65535/bazarr
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/bazarr
+  - https://github.com/trueforge-org/containers/tree/main/apps/bazarr
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/bazarr
 type: application
 version: 23.2.18
diff --git a/charts/stable/calibre-web/Chart.yaml b/charts/stable/calibre-web/Chart.yaml
index 34eed920558..7b22ec1d9de 100644
--- a/charts/stable/calibre-web/Chart.yaml
+++ b/charts/stable/calibre-web/Chart.yaml
@@ -34,7 +34,7 @@ maintainers:
 name: calibre-web
 sources:
   - https://github.com/janeczku/calibre-web
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/calibre-web
+  - https://github.com/trueforge-org/containers/tree/main/apps/calibre-web
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/calibre-web
 type: application
 version: 21.14.19
diff --git a/charts/stable/cloudflareddns/Chart.yaml b/charts/stable/cloudflareddns/Chart.yaml
index fafd1dc21e2..f9a34c3837f 100644
--- a/charts/stable/cloudflareddns/Chart.yaml
+++ b/charts/stable/cloudflareddns/Chart.yaml
@@ -34,7 +34,7 @@ maintainers:
 name: cloudflareddns
 sources:
   - https://github.com/hotio/cloudflareddns
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/cloudflareddns
+  - https://github.com/trueforge-org/containers/tree/main/apps/cloudflareddns
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/cloudflareddns
   - https://hotio.dev/containers/cloudflareddns/
 type: application
diff --git a/charts/stable/code-server/Chart.yaml b/charts/stable/code-server/Chart.yaml
index 802f741a835..5d9bdc79e29 100644
--- a/charts/stable/code-server/Chart.yaml
+++ b/charts/stable/code-server/Chart.yaml
@@ -35,7 +35,7 @@ maintainers:
 name: code-server
 sources:
   - https://github.com/cdr/code-server
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/code-server
+  - https://github.com/trueforge-org/containers/tree/main/apps/code-server
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/code-server
 type: application
 version: 14.19.17
diff --git a/charts/stable/doplarr/Chart.yaml b/charts/stable/doplarr/Chart.yaml
index 36cbe3b9c8f..5d008381b75 100644
--- a/charts/stable/doplarr/Chart.yaml
+++ b/charts/stable/doplarr/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
 name: doplarr
 sources:
   - https://github.com/kiranshila/Doplarr
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/doplarr
+  - https://github.com/trueforge-org/containers/tree/main/apps/doplarr
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/doplarr
 type: application
 version: 12.14.18
diff --git a/charts/stable/duplicacy/Chart.yaml b/charts/stable/duplicacy/Chart.yaml
index 8e91fedc1f0..826996938c3 100644
--- a/charts/stable/duplicacy/Chart.yaml
+++ b/charts/stable/duplicacy/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
     url: https://trueforge.org
 name: duplicacy
 sources:
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/duplicacy
+  - https://github.com/trueforge-org/containers/tree/main/apps/duplicacy
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/duplicacy
   - https://hotio.dev/containers/duplicacy
 type: application
diff --git a/charts/stable/duplicati/Chart.yaml b/charts/stable/duplicati/Chart.yaml
index f181d685db1..336d6c731d2 100644
--- a/charts/stable/duplicati/Chart.yaml
+++ b/charts/stable/duplicati/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
 name: duplicati
 sources:
   - https://github.com/duplicati/duplicati
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/duplicati
+  - https://github.com/trueforge-org/containers/tree/main/apps/duplicati
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/duplicati
 type: application
 version: 16.14.18
diff --git a/charts/stable/emby/Chart.yaml b/charts/stable/emby/Chart.yaml
index 3c030de8b63..5931717043f 100644
--- a/charts/stable/emby/Chart.yaml
+++ b/charts/stable/emby/Chart.yaml
@@ -34,7 +34,7 @@ maintainers:
 name: emby
 sources:
   - https://github.com/linuxserver/docker-emby.git
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/emby
+  - https://github.com/trueforge-org/containers/tree/main/apps/emby
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/emby
   - https://hub.docker.com/r/alpine/socat
 type: application
diff --git a/charts/stable/ersatztv/Chart.yaml b/charts/stable/ersatztv/Chart.yaml
index 4bdcbc9bafb..00a78455227 100644
--- a/charts/stable/ersatztv/Chart.yaml
+++ b/charts/stable/ersatztv/Chart.yaml
@@ -37,3 +37,4 @@ sources:
   - https://hub.docker.com/r/jasongdove/ersatztv
 type: application
 version: 10.0.11
+
diff --git a/charts/stable/esphome/Chart.yaml b/charts/stable/esphome/Chart.yaml
index 6feda377540..99a81d20c1e 100644
--- a/charts/stable/esphome/Chart.yaml
+++ b/charts/stable/esphome/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
 name: esphome
 sources:
   - https://github.com/esphome/esphome
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/esphome
+  - https://github.com/trueforge-org/containers/tree/main/apps/esphome
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/esphome
 type: application
 version: 24.0.6
diff --git a/charts/stable/flood/Chart.yaml b/charts/stable/flood/Chart.yaml
index bc5983c51fe..cab43fe5bda 100644
--- a/charts/stable/flood/Chart.yaml
+++ b/charts/stable/flood/Chart.yaml
@@ -35,7 +35,7 @@ maintainers:
 name: flood
 sources:
   - https://github.com/jesec/flood
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/flood
+  - https://github.com/trueforge-org/containers/tree/main/apps/flood
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/flood
 type: application
 version: 16.16.18
diff --git a/charts/stable/foldingathome/Chart.yaml b/charts/stable/foldingathome/Chart.yaml
index a14e6cc8585..c472b5be39d 100644
--- a/charts/stable/foldingathome/Chart.yaml
+++ b/charts/stable/foldingathome/Chart.yaml
@@ -31,7 +31,7 @@ maintainers:
     url: https://trueforge.org
 name: foldingathome
 sources:
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/foldingathome
+  - https://github.com/trueforge-org/containers/tree/main/apps/foldingathome
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/foldingathome
 type: application
 version: 13.14.18
diff --git a/charts/stable/home-assistant/Chart.yaml b/charts/stable/home-assistant/Chart.yaml
index c206cf539a7..0c1d3e1057b 100644
--- a/charts/stable/home-assistant/Chart.yaml
+++ b/charts/stable/home-assistant/Chart.yaml
@@ -35,8 +35,8 @@ name: home-assistant
 sources:
   - https://github.com/cdr/code-server
   - https://github.com/home-assistant/home-assistant
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/go-yq
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/home-assistant
+  - https://github.com/trueforge-org/containers/tree/main/apps/go-yq
+  - https://github.com/trueforge-org/containers/tree/main/apps/home-assistant
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/home-assistant
 type: application
 version: 29.0.7
diff --git a/charts/stable/hytale/Chart.yaml b/charts/stable/hytale/Chart.yaml
index fcc0cbd7ca8..fed745d6727 100644
--- a/charts/stable/hytale/Chart.yaml
+++ b/charts/stable/hytale/Chart.yaml
@@ -33,7 +33,7 @@ maintainers:
     url: https://trueforge.org
 name: hytale
 sources:
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/hytale
+  - https://github.com/trueforge-org/containers/tree/main/apps/hytale
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/hytale
   - https://hytale.com
 type: application
diff --git a/charts/stable/it-tools/Chart.yaml b/charts/stable/it-tools/Chart.yaml
index 74d9309e041..50d4d5dfabc 100644
--- a/charts/stable/it-tools/Chart.yaml
+++ b/charts/stable/it-tools/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
 name: it-tools
 sources:
   - https://github.com/CorentinTh/it-tools
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/it-tools
+  - https://github.com/trueforge-org/containers/tree/main/apps/it-tools
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/it-tools
 type: application
 version: 8.13.19
diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml
index a0f7b5a25e1..56e62308a31 100644
--- a/charts/stable/jackett/Chart.yaml
+++ b/charts/stable/jackett/Chart.yaml
@@ -35,7 +35,7 @@ name: jackett
 sources:
   - https://github.com/Jackett/Jackett
   - https://github.com/geek-cookbook/containers/pkgs/container/jackett
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/jackett
+  - https://github.com/trueforge-org/containers/tree/main/apps/jackett
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/jackett
 type: application
 version: 26.2.42
diff --git a/charts/stable/jellyfin/Chart.yaml b/charts/stable/jellyfin/Chart.yaml
index 7f4ca67b275..13a1f47fc01 100644
--- a/charts/stable/jellyfin/Chart.yaml
+++ b/charts/stable/jellyfin/Chart.yaml
@@ -34,7 +34,7 @@ maintainers:
 name: jellyfin
 sources:
   - https://github.com/jellyfin/jellyfin
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/jellyfin
+  - https://github.com/trueforge-org/containers/tree/main/apps/jellyfin
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/jellyfin
   - https://hub.docker.com/r/alpine/socat
 type: application
diff --git a/charts/stable/jellyseerr/Chart.yaml b/charts/stable/jellyseerr/Chart.yaml
index af3cd587fee..16aa0b09b59 100644
--- a/charts/stable/jellyseerr/Chart.yaml
+++ b/charts/stable/jellyseerr/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
 name: jellyseerr
 sources:
   - https://github.com/Fallenbagel/jellyseerr
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/jellyseer
+  - https://github.com/trueforge-org/containers/tree/main/apps/jellyseer
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/jellyseerr
 type: application
 version: 13.13.20
diff --git a/charts/stable/kavita/Chart.yaml b/charts/stable/kavita/Chart.yaml
index fd82d7dbcdc..4d67a3b228e 100644
--- a/charts/stable/kavita/Chart.yaml
+++ b/charts/stable/kavita/Chart.yaml
@@ -34,7 +34,7 @@ maintainers:
     url: https://trueforge.org
 name: kavita
 sources:
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/kavita
+  - https://github.com/trueforge-org/containers/tree/main/apps/kavita
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/kavita
   - https://www.kavitareader.com
 type: application
diff --git a/charts/stable/kopia/Chart.yaml b/charts/stable/kopia/Chart.yaml
index 4f5cfcf8f78..bba80b730d6 100644
--- a/charts/stable/kopia/Chart.yaml
+++ b/charts/stable/kopia/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
 name: kopia
 sources:
   - https://github.com/kopia/kopia
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/kopia
+  - https://github.com/trueforge-org/containers/tree/main/apps/kopia
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/kopia
   - https://kopia.io/docs/installation/#docker-images
 type: application
diff --git a/charts/stable/kubernetes-dashboard/Chart.yaml b/charts/stable/kubernetes-dashboard/Chart.yaml
index d2f4e61ff06..5dc28b22324 100644
--- a/charts/stable/kubernetes-dashboard/Chart.yaml
+++ b/charts/stable/kubernetes-dashboard/Chart.yaml
@@ -40,7 +40,7 @@ maintainers:
 name: kubernetes-dashboard
 sources:
   - https://github.com/kubernetes-dashboard/kubernetes-dashboard
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/kube-sa-proxy
+  - https://github.com/trueforge-org/containers/tree/main/apps/kube-sa-proxy
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/kubernetes-dashboard
   - https://github.com/trueforge/truecharts/tree/master/charts/stable/kubernetes-dashboard
   - https://hub.docker.com/r/kubernetesui/dashboard-api
diff --git a/charts/stable/lazylibrarian/Chart.yaml b/charts/stable/lazylibrarian/Chart.yaml
index e91424df55d..ae859d394ae 100644
--- a/charts/stable/lazylibrarian/Chart.yaml
+++ b/charts/stable/lazylibrarian/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
     url: https://trueforge.org
 name: lazylibrarian
 sources:
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/lazylibrarian
+  - https://github.com/trueforge-org/containers/tree/main/apps/lazylibrarian
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/lazylibrarian
   - https://gitlab.com/LazyLibrarian/LazyLibrarian.git
   - https://lazylibrarian.gitlab.io
diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml
index 9a0c8ccdbfe..015cc42d38a 100644
--- a/charts/stable/lidarr/Chart.yaml
+++ b/charts/stable/lidarr/Chart.yaml
@@ -35,7 +35,7 @@ name: lidarr
 sources:
   - https://ghcr.io/onedr0p/exportarr
   - https://github.com/Lidarr/Lidarr
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/lidarr
+  - https://github.com/trueforge-org/containers/tree/main/apps/lidarr
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/lidarr
 type: application
 version: 28.3.23
diff --git a/charts/stable/lvm-disk-watcher/Chart.yaml b/charts/stable/lvm-disk-watcher/Chart.yaml
index 6bb5cfff1cd..8398d54eebe 100644
--- a/charts/stable/lvm-disk-watcher/Chart.yaml
+++ b/charts/stable/lvm-disk-watcher/Chart.yaml
@@ -33,7 +33,7 @@ maintainers:
 name: lvm-disk-watcher
 sources:
   - https://github.com/lvm-disk-watcher/lvm-disk-watcher
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/lvm-disk-watcher
+  - https://github.com/trueforge-org/containers/tree/main/apps/lvm-disk-watcher
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/lvm-disk-watcher
   - https://lvm-disk-watcher.universe.tf
 type: application
diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
index 5d42fe5fd16..36f61c1c4a9 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -44,10 +44,10 @@ name: nextcloud
 sources:
   - https://github.com/nextcloud/docker
   - https://github.com/nextcloud/helm
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/nextcloud-fpm
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/nextcloud-imaginary
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/nextcloud-notify-push
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/nginx
+  - https://github.com/trueforge-org/containers/tree/main/apps/nextcloud-fpm
+  - https://github.com/trueforge-org/containers/tree/main/apps/nextcloud-imaginary
+  - https://github.com/trueforge-org/containers/tree/main/apps/nextcloud-notify-push
+  - https://github.com/trueforge-org/containers/tree/main/apps/nginx
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/nextcloud
   - https://github.com/trueforge/truecharts/tree/master/charts/stable/nextcloud
   - https://hub.docker.com/r/clamav/clamav
diff --git a/charts/stable/nzbget/Chart.yaml b/charts/stable/nzbget/Chart.yaml
index 91211c7df53..07330e82b94 100644
--- a/charts/stable/nzbget/Chart.yaml
+++ b/charts/stable/nzbget/Chart.yaml
@@ -33,7 +33,7 @@ maintainers:
 name: nzbget
 sources:
   - https://github.com/nzbgetcom/nzbget
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/nzbget
+  - https://github.com/trueforge-org/containers/tree/main/apps/nzbget
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/nzbget
   - https://nzbget.net/
 type: application
diff --git a/charts/stable/nzbhydra/Chart.yaml b/charts/stable/nzbhydra/Chart.yaml
index 00aa6503805..dbffa287419 100644
--- a/charts/stable/nzbhydra/Chart.yaml
+++ b/charts/stable/nzbhydra/Chart.yaml
@@ -39,7 +39,7 @@ maintainers:
 name: nzbhydra
 sources:
   - https://github.com/theotherp/nzbhydra2
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/nzbhydra2
+  - https://github.com/trueforge-org/containers/tree/main/apps/nzbhydra2
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/nzbhydra
 type: application
 version: 28.4.0
diff --git a/charts/stable/plex/Chart.yaml b/charts/stable/plex/Chart.yaml
index 74ffecb0093..fcd4a0594bc 100644
--- a/charts/stable/plex/Chart.yaml
+++ b/charts/stable/plex/Chart.yaml
@@ -33,7 +33,7 @@ maintainers:
 name: plex
 sources:
   - https://github.com/k8s-at-home/container-images/pkgs/container/plex
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/plex
+  - https://github.com/trueforge-org/containers/tree/main/apps/plex
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/plex
 type: application
 version: 21.3.0
diff --git a/charts/stable/prowlarr/Chart.yaml b/charts/stable/prowlarr/Chart.yaml
index 448c32dbf2c..daa89137791 100644
--- a/charts/stable/prowlarr/Chart.yaml
+++ b/charts/stable/prowlarr/Chart.yaml
@@ -36,7 +36,7 @@ sources:
   - https://ghcr.io/onedr0p/exportarr
   - https://github.com/Prowlarr/Prowlarr
   - https://github.com/k8s-at-home/container-images
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/prowlarr
+  - https://github.com/trueforge-org/containers/tree/main/apps/prowlarr
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/prowlarr
 type: application
 version: 21.3.19
diff --git a/charts/stable/qbittorrent/Chart.yaml b/charts/stable/qbittorrent/Chart.yaml
index a0cbc847ee8..b8ed8fbdeb6 100644
--- a/charts/stable/qbittorrent/Chart.yaml
+++ b/charts/stable/qbittorrent/Chart.yaml
@@ -33,7 +33,7 @@ maintainers:
 name: qbittorrent
 sources:
   - https://github.com/qbittorrent/qBittorrent
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/qbittorrent
+  - https://github.com/trueforge-org/containers/tree/main/apps/qbittorrent
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/qbittorrent
   - https://hub.docker.com/r/mjmeli/qbittorrent-port-forward-gluetun-server
 type: application
diff --git a/charts/stable/radarr/Chart.yaml b/charts/stable/radarr/Chart.yaml
index e8c04a7b71a..a265f74d27b 100644
--- a/charts/stable/radarr/Chart.yaml
+++ b/charts/stable/radarr/Chart.yaml
@@ -35,7 +35,7 @@ name: radarr
 sources:
   - https://ghcr.io/onedr0p/exportarr
   - https://github.com/Radarr/Radarr
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/radarr
+  - https://github.com/trueforge-org/containers/tree/main/apps/radarr
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/radarr
 type: application
 version: 26.3.18
diff --git a/charts/stable/renovate/Chart.yaml b/charts/stable/renovate/Chart.yaml
index 9657aa0c3d5..d729672571f 100644
--- a/charts/stable/renovate/Chart.yaml
+++ b/charts/stable/renovate/Chart.yaml
@@ -31,7 +31,7 @@ maintainers:
     url: https://trueforge.org
 name: renovate
 sources:
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/renovate
+  - https://github.com/trueforge-org/containers/tree/main/apps/renovate
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/renovate
 type: application
 version: 4.37.0
diff --git a/charts/stable/sabnzbd/Chart.yaml b/charts/stable/sabnzbd/Chart.yaml
index b121d91cf1b..2ae9a04a9c3 100644
--- a/charts/stable/sabnzbd/Chart.yaml
+++ b/charts/stable/sabnzbd/Chart.yaml
@@ -33,7 +33,7 @@ maintainers:
 name: sabnzbd
 sources:
   - https://ghcr.io/onedr0p/exportarr
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/sabnzbd
+  - https://github.com/trueforge-org/containers/tree/main/apps/sabnzbd
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/sabnzbd
   - https://sabnzbd.org/
 type: application
diff --git a/charts/stable/seerr/Chart.yaml b/charts/stable/seerr/Chart.yaml
index fa39f3b1372..970ad41c31a 100644
--- a/charts/stable/seerr/Chart.yaml
+++ b/charts/stable/seerr/Chart.yaml
@@ -32,7 +32,7 @@ maintainers:
 name: seerr
 sources:
   - https://github.com/Fallenbagel/seerr
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/seerr
+  - https://github.com/trueforge-org/containers/tree/main/apps/seerr
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/seerr
 type: application
 version: 13.13.18
diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml
index aa762305a32..617b4082a44 100644
--- a/charts/stable/sonarr/Chart.yaml
+++ b/charts/stable/sonarr/Chart.yaml
@@ -35,7 +35,7 @@ name: sonarr
 sources:
   - https://ghcr.io/onedr0p/exportarr
   - https://github.com/Sonarr/Sonarr
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/sonarr
+  - https://github.com/trueforge-org/containers/tree/main/apps/sonarr
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/sonarr
 type: application
 version: 25.2.18
diff --git a/charts/stable/theme-park/Chart.yaml b/charts/stable/theme-park/Chart.yaml
index 3aeb61ba8de..cccdcfaad33 100644
--- a/charts/stable/theme-park/Chart.yaml
+++ b/charts/stable/theme-park/Chart.yaml
@@ -33,7 +33,7 @@ maintainers:
 name: theme-park
 sources:
   - https://github.com/gilbn/theme.park
-  - https://github.com/trueforge-org/containers/tree/main/apps/oci.trueforge.org/containerforge/theme-park
+  - https://github.com/trueforge-org/containers/tree/main/apps/theme-park
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/theme-park
 type: application
 version: 13.3.3