diff --git a/.github/ct-install.yaml b/.github/ct-install.yaml
index 34b6c30ed6a..610f9c7ece7 100644
--- a/.github/ct-install.yaml
+++ b/.github/ct-install.yaml
@@ -182,10 +182,8 @@ excluded-charts:
   - charts/stable/zigbee2mqtt
 chart-repos:
   - jetstack=https://charts.jetstack.io
-  - vmwaretanzu=https://vmware-tanzu.github.io/helm-charts
   - cnpg=https://cloudnative-pg.github.io/charts
   - metallb=https://metallb.github.io/metallb
-  - prometheus-community=https://prometheus-community.github.io/helm-charts
   - openebs=https://openebs.github.io/charts
   - csi-driver-smb=https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts
   - csi-driver-nfs=https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts
diff --git a/.github/ct-lint.yaml b/.github/ct-lint.yaml
index 6873ec23948..49b8f15e80f 100644
--- a/.github/ct-lint.yaml
+++ b/.github/ct-lint.yaml
@@ -12,10 +12,8 @@ chart-dirs:
 excluded-charts: []
 chart-repos:
   - jetstack=https://charts.jetstack.io
-  - vmwaretanzu=https://vmware-tanzu.github.io/helm-charts
   - cnpg=https://cloudnative-pg.github.io/charts
   - metallb=https://metallb.github.io/metallb
-  - prometheus-community=https://prometheus-community.github.io/helm-charts
   - openebs=https://openebs.github.io/charts
   - csi-driver-smb=https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts
   - csi-driver-nfs=https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts
diff --git a/.github/scripts/prep_helm.sh b/.github/scripts/prep_helm.sh
index bbe5f529f97..179afd03064 100755
--- a/.github/scripts/prep_helm.sh
+++ b/.github/scripts/prep_helm.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 
 helm repo add jetstack https://charts.jetstack.io
-helm repo add vmwaretanzu https://vmware-tanzu.github.io/helm-charts
 helm repo add cnpg https://cloudnative-pg.github.io/charts
 helm repo add metallb https://metallb.github.io/metallb
-helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 helm repo add openebs https://openebs.github.io/charts
 helm repo add csi-driver-smb https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts
 helm repo add csi-driver-nfs https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts
diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml
index 134520a2b88..a5459c6a894 100644
--- a/.github/workflows/charts-release.yaml
+++ b/.github/workflows/charts-release.yaml
@@ -68,11 +68,7 @@ jobs:
 
       - name: Prep Helm
         run: |
-          helm repo add jetstack https://charts.jetstack.io
-          helm repo add vmwaretanzu https://vmware-tanzu.github.io/helm-charts
-          helm repo add cnpg https://cloudnative-pg.github.io/charts
-          helm repo add metallb https://metallb.github.io/metallb
-          helm repo update
+          ./.github/scripts/prep_helm.sh
 
       - name: Prep go-yq
         run: |
diff --git a/charts/enterprise/velero/Chart.yaml b/charts/enterprise/velero/Chart.yaml
index 778fe3a6f55..f7588c354bd 100644
--- a/charts/enterprise/velero/Chart.yaml
+++ b/charts/enterprise/velero/Chart.yaml
@@ -18,7 +18,7 @@ dependencies:
     import-values: []
   - name: velero
     version: 5.4.1
-    repository: oci://ghcr.io/vmware-tanzu/charts/velero
+    repository: oci://ghcr.io/vmware-tanzu/charts
     condition: ""
     alias: velero
     tags: []
diff --git a/charts/operators/prometheus-operator/Chart.yaml b/charts/operators/prometheus-operator/Chart.yaml
index 06d07549774..e3cb5fff34a 100644
--- a/charts/operators/prometheus-operator/Chart.yaml
+++ b/charts/operators/prometheus-operator/Chart.yaml
@@ -18,7 +18,7 @@ dependencies:
     import-values: []
   - name: kube-prometheus-stack
     version: 56.8.2
-    repository: https://prometheus-community.github.io/helm-charts
+    repository: oci://ghcr.io/prometheus-community/charts
     condition: ""
     alias: kps
     tags: []