diff --git a/charts/incubator/omada-controller/values.yaml b/charts/incubator/omada-controller/values.yaml
index 2f88e5c8a5a..e4abe48eec2 100644
--- a/charts/incubator/omada-controller/values.yaml
+++ b/charts/incubator/omada-controller/values.yaml
@@ -1,6 +1,6 @@
 image:
   # -- image repository
-  repository: tccr.io/mbentley/omada-controller
+  repository: tccr.io/truecharts/omada-controller
   # -- image tag
   tag: v4.4@sha256:acaf5721f902b62722f35b78d165331acc099f307180f51241ce1a850b140eca
   # -- image pull policy
diff --git a/charts/incubator/xbackbone/values.yaml b/charts/incubator/xbackbone/values.yaml
index d3e382d4c1f..073ed16fd76 100644
--- a/charts/incubator/xbackbone/values.yaml
+++ b/charts/incubator/xbackbone/values.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: pe46dro/xbackbone-docker
+  repository: tccr.io/truecharts/xbackbone
   tag: v3.3.3@sha256:09dfe3aa10f61ce1da5e60a282be62f139f267f44a073862feda67cd960fa71e
   pullPolicy: IfNotPresent
 
diff --git a/charts/stable/code-server/values.yaml b/charts/stable/code-server/values.yaml
index 4346205983e..3e693a8b21d 100644
--- a/charts/stable/code-server/values.yaml
+++ b/charts/stable/code-server/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/code-server
   pullPolicy: IfNotPresent
-  tag: version-v3.11.1@sha256:a385ba5cb16136b14ae4cd99ca95c20ac77f9831ac3fb63937a1998e1d31be2a
+  tag: v3.11.1@sha256:a385ba5cb16136b14ae4cd99ca95c20ac77f9831ac3fb63937a1998e1d31be2a
 
 # PASSWORD: password
 # SUDO_PASSWORD: password
diff --git a/charts/stable/cryptofolio/values.yaml b/charts/stable/cryptofolio/values.yaml
index a86cd5329d1..ec02b0a7056 100644
--- a/charts/stable/cryptofolio/values.yaml
+++ b/charts/stable/cryptofolio/values.yaml
@@ -2,7 +2,7 @@ image:
   # -- image repository
   repository: tccr.io/truecharts/cryptofolio
   # -- image tag
-  tag: V.2.2.0@sha256:e6e6612bb94c877b5e31853c639761d09076180fe0a6c4fdb0fb91f73d9f480e
+  tag: v2.2.0@sha256:e6e6612bb94c877b5e31853c639761d09076180fe0a6c4fdb0fb91f73d9f480e
   # -- image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/stable/deconz/values.yaml b/charts/stable/deconz/values.yaml
index 7f589e63d41..f32b8cf0a16 100644
--- a/charts/stable/deconz/values.yaml
+++ b/charts/stable/deconz/values.yaml
@@ -1,6 +1,6 @@
 image:
   # -- image repository
-  repository: tccr.io/truecharts/deconz-docker
+  repository: tccr.io/truecharts/deconz
     # -- image tag
   tag: v2.13.02@sha256:ed4a88ee75eeaf04155c3e733cf38011247139ed265d178b67ddde46889eca8c
   # -- image pull policy
diff --git a/charts/stable/deepstack-cpu/values.yaml b/charts/stable/deepstack-cpu/values.yaml
index d488b2d1b9e..295b58153ca 100644
--- a/charts/stable/deepstack-cpu/values.yaml
+++ b/charts/stable/deepstack-cpu/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/deepstack-cpu
   pullPolicy: IfNotPresent
-  tag: cpu-2021.09.1@sha256:359dc8c6c5056891b2a4f419902616b8b8b9bc9068b0c20fd40e13bc7a5583b5
+  tag: v2021.09.1@sha256:359dc8c6c5056891b2a4f419902616b8b8b9bc9068b0c20fd40e13bc7a5583b5
 
 service:
   main:
diff --git a/charts/stable/deepstack-gpu/values.yaml b/charts/stable/deepstack-gpu/values.yaml
index a23f97497b3..395604c0d78 100644
--- a/charts/stable/deepstack-gpu/values.yaml
+++ b/charts/stable/deepstack-gpu/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/deepstack-gpu
   pullPolicy: IfNotPresent
-  tag: gpu-2021.09.1@sha256:e71f54392c9b1199f9142d7ffcd8f0c3a6e91fe69c02a44fd76f906dd88849cb
+  tag: v2021.09.1@sha256:e71f54392c9b1199f9142d7ffcd8f0c3a6e91fe69c02a44fd76f906dd88849cb
 
 service:
   main:
diff --git a/charts/stable/dsmr-reader/values.yaml b/charts/stable/dsmr-reader/values.yaml
index b68a4798c88..0f996740c09 100644
--- a/charts/stable/dsmr-reader/values.yaml
+++ b/charts/stable/dsmr-reader/values.yaml
@@ -1,8 +1,8 @@
 image:
   # -- image repository
-  repository: tccr.io/truecharts/dsmr-reader-docker
+  repository: tccr.io/truecharts/dsmr-reader
   # -- image tag
-  tag: latest-2021.09.02-amd64@sha256:4858edb1ae63a20639a0ef9c51c7b2cf599686db5c582ead7b37b2a288122935
+  tag: v2021.09.02@sha256:4858edb1ae63a20639a0ef9c51c7b2cf599686db5c582ead7b37b2a288122935
   # -- image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/stable/duplicati/values.yaml b/charts/stable/duplicati/values.yaml
index a2100d958b5..dfe8dd1d368 100644
--- a/charts/stable/duplicati/values.yaml
+++ b/charts/stable/duplicati/values.yaml
@@ -2,7 +2,7 @@ image:
   # -- image repository
   repository: tccr.io/truecharts/duplicati
   # -- image tag
-  tag: beta@sha256:22f5231c3a36979750d10bc8df7fbbb7b112c9fca76d85288fa8e90afb6c9635
+  tag: vbeta@sha256:22f5231c3a36979750d10bc8df7fbbb7b112c9fca76d85288fa8e90afb6c9635
   # -- image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/stable/kms/values.yaml b/charts/stable/kms/values.yaml
index 916fd1c20ec..33f7f13df90 100644
--- a/charts/stable/kms/values.yaml
+++ b/charts/stable/kms/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/kms
   pullPolicy: IfNotPresent
-  tag: minimal@sha256:769cc69064bf60c67855a25a4c9e2959fd1e5e640396c35c15599d342d61061e
+  tag: vminimal@sha256:769cc69064bf60c67855a25a4c9e2959fd1e5e640396c35c15599d342d61061e
 
 securityContext:
   readOnlyRootFilesystem: false
diff --git a/charts/stable/littlelink/values.yaml b/charts/stable/littlelink/values.yaml
index 48239f0efa1..84794e3a510 100644
--- a/charts/stable/littlelink/values.yaml
+++ b/charts/stable/littlelink/values.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: tccr.io/techno-tim/littlelink-server
+  repository: tccr.io/truecharts/littlelink-server
   pullPolicy: IfNotPresent
   tag: latest@sha256:0175e541c76255b264b2c68af997b6e2a2b910c420861e4f92e4e4bf5d0ed776
 
diff --git a/charts/stable/minio/values.yaml b/charts/stable/minio/values.yaml
index d4fe1bf880c..784e6370cd3 100644
--- a/charts/stable/minio/values.yaml
+++ b/charts/stable/minio/values.yaml
@@ -2,7 +2,7 @@ image:
   # -- image repository
   repository: tccr.io/truecharts/minio
   # -- image tag
-  tag: RELEASE.2021-11-05T09-16-26Z@sha256:a11692068c588e7ea895f76d619a5fcb30eefc8a759e2ad7d6ec92331e43386e
+  tag: latest@sha256:a11692068c588e7ea895f76d619a5fcb30eefc8a759e2ad7d6ec92331e43386e
   # -- image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/stable/pgadmin/values.yaml b/charts/stable/pgadmin/values.yaml
index 7a0bdbb493f..d65b371cc69 100644
--- a/charts/stable/pgadmin/values.yaml
+++ b/charts/stable/pgadmin/values.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: tccr.io/dpage/pgadmin4
+  repository: tccr.io/truecharts/pgadmin4
   pullPolicy: IfNotPresent
   tag: v6.2@sha256:13e2208c50cb8666967e0396fa4898b555b41b507149dd468966d64caab7da76
 
diff --git a/charts/stable/pretend-youre-xyzzy/values.yaml b/charts/stable/pretend-youre-xyzzy/values.yaml
index 1c955e19105..ef030261411 100644
--- a/charts/stable/pretend-youre-xyzzy/values.yaml
+++ b/charts/stable/pretend-youre-xyzzy/values.yaml
@@ -1,6 +1,6 @@
 image:
   # -- image repository
-  repository: tccr.io/emcniece/dockeryourxyzzy
+  repository: tccr.io/truecharts/pretend-youre-xyzzy
   # -- image tag
   tag: v4@sha256:04eccbccc15cb755bbdcdd277d7ceaefb776d22b1ca8de6a97cc97eccfc7cd17
   # -- image pull policy