diff --git a/.github/workflows/common-tests.yaml b/.github/workflows/common-tests.yaml
index ad8aaabe01e..8dd2aba3809 100644
--- a/.github/workflows/common-tests.yaml
+++ b/.github/workflows/common-tests.yaml
@@ -232,19 +232,18 @@ jobs:
       - name: Add Dependencies
         run: |
           if [[ "${{ matrix.values }}" =~ (ingress|metrics|cnpg|volsync).*-values.yaml ]]; then
-            helm install prometheus-operator oci://oci.trueforge.org/truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait
+            helm install kube-prometheus-stack oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack --namespace kube-prometheus-stack --create-namespace --set alertmanager.enabled=false --set grafana.enabled=false --set kubeProxy.enabled=false --wait
           fi
           if [[ "${{ matrix.values }}" =~ cnpg.*-values.yaml ]]; then
-            helm install cloudnative-pg oci://oci.trueforge.org/truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait
+            helm install cloudnative-pg oci://ghcr.io/cloudnative-pg/charts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait
           fi
           if [[ "${{ matrix.values }}" =~ ingress.*-values.yaml ]]; then
-            helm install cert-manager oci://oci.trueforge.org/truecharts/cert-manager --namespace cert-manager --create-namespace --wait
-            # helm install traefik-crds oci://oci.trueforge.org/truecharts/traefik-crds --namespace traefik-crds --create-namespace --wait
-            helm install traefik oci://oci.trueforge.org/truecharts/traefik --namespace traefik --create-namespace --wait \
-              --set service.main.type=ClusterIP --set service.tcp.type=ClusterIP
+            helm install cert-manager oci://quay.io/jetstack/charts/cert-manager --namespace cert-manager --create-namespace --set crds.enabled=true --wait
+            helm install ingress-nginx oci://ghcr.io/home-operations/charts-mirror/ingress-nginx --namespace ingress-nginx --create-namespace \
+            --set controller.ingressClassResource.default=true --set controller.publishService.enabled=false --set controller.service.type="ClusterIP" --set controller.config.allow-snippet-annotations=true --set controller.config.annotations-risk-level="Critical" --wait
           fi
           if [[ "${{ matrix.values }}" =~ volsync.*-values.yaml ]]; then
-            helm install volumesnapshots oci://oci.trueforge.org/truecharts/volumesnapshots --namespace volumesnapshots --create-namespace --wait
+            helm install snapshot-controller oci://oci.trueforge.org/truecharts/snapshot-controller --namespace snapshot-controller --create-namespace --wait
             helm install volsync oci://oci.trueforge.org/truecharts/volsync --namespace volsync --create-namespace --wait
           fi
 
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 60781c5b0bc..0c0bfb6f21f 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -42,5 +42,5 @@ sources:
   - https://github.com/trueforge-org/truecharts/tree/master/charts/library/common
   - https://hub.docker.com/_/
 type: library
-version: 28.29.18
+version: 28.29.19
 
diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml
index 3269e61660e..7e12fe3e45a 100644
--- a/charts/library/common/values.yaml
+++ b/charts/library/common/values.yaml
@@ -604,7 +604,7 @@ scratchImage:
 
 kubectlImage:
   repository: oci.trueforge.org/containerforge/kubectl
-  tag: "1.31.1@sha256:188024f6b8c4cdfa75f9ac76383a5ccb0b9a9bb517da77b85ca7519af1faec2b"
+  tag: "1.31.1@sha256:57ccc6428274c4f1ab5ea7e922c0b1b301736778a4786598730f6cfd4ecad0cb"
   pullPolicy: IfNotPresent
 
 wgetImage: