diff --git a/pkg/kubewarden/chart/kubewarden/policy-server/General.vue b/pkg/kubewarden/chart/kubewarden/policy-server/General.vue
index 44421175..a88732d1 100644
--- a/pkg/kubewarden/chart/kubewarden/policy-server/General.vue
+++ b/pkg/kubewarden/chart/kubewarden/policy-server/General.vue
@@ -1,5 +1,7 @@
 <script>
+import { mapGetters } from 'vuex';
 import isEmpty from 'lodash/isEmpty';
+
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { CATALOG } from '@shell/config/types';
 import { _CREATE } from '@shell/config/query-params';
@@ -72,12 +74,26 @@ export default {
   },
 
   computed: {
+    ...mapGetters({ charts: 'catalog/charts' }),
+
     isCreate() {
       return this.mode === _CREATE;
     },
 
     defaultsChart() {
-      return this.$store.getters['catalog/chart']({ chartName: KUBEWARDEN_CHARTS.DEFAULTS });
+      if ( this.kubewardenRepo ) {
+        return this.$store.getters['catalog/chart']({
+          repoName:  this.kubewardenRepo.repoName,
+          repoType:  this.kubewardenRepo.repoType,
+          chartName: KUBEWARDEN_CHARTS.DEFAULTS
+        });
+      }
+
+      return null;
+    },
+
+    kubewardenRepo() {
+      return this.charts?.find(chart => chart.chartName === KUBEWARDEN_CHARTS.DEFAULTS);
     },
 
     showVersionBanner() {
diff --git a/pkg/kubewarden/components/Dashboard/DashboardView.vue b/pkg/kubewarden/components/Dashboard/DashboardView.vue
index 3b7a8e4f..dc653442 100644
--- a/pkg/kubewarden/components/Dashboard/DashboardView.vue
+++ b/pkg/kubewarden/components/Dashboard/DashboardView.vue
@@ -69,7 +69,7 @@ export default {
         });
       }
 
-      return true;
+      return false;
     },
 
     /** Counts the current policy server pods - returns the status and total count */
diff --git a/pkg/kubewarden/components/Dashboard/InstallView.vue b/pkg/kubewarden/components/Dashboard/InstallView.vue
index 58a55de0..9fdf6df9 100644
--- a/pkg/kubewarden/components/Dashboard/InstallView.vue
+++ b/pkg/kubewarden/components/Dashboard/InstallView.vue
@@ -109,7 +109,7 @@ export default {
 
   computed: {
     ...mapGetters(['currentCluster', 'currentProduct']),
-    ...mapGetters({ allRepos: 'catalog/repos', t: 'i18n/t' }),
+    ...mapGetters({ charts: 'catalog/charts', t: 'i18n/t' }),
 
     isAirgap() {
       return this.$store.getters['kubewarden/airGapped'];
@@ -120,15 +120,19 @@ export default {
     },
 
     controllerChart() {
-      return this.$store.getters['catalog/chart']({ chartName: KUBEWARDEN_CHARTS.CONTROLLER });
+      if ( this.kubewardenRepo ) {
+        return this.$store.getters['catalog/chart']({
+          repoName:  this.kubewardenRepo.repoName,
+          repoType:  this.kubewardenRepo.repoType,
+          chartName: KUBEWARDEN_CHARTS.CONTROLLER
+        });
+      }
+
+      return null;
     },
 
     kubewardenRepo() {
-      if ( !this.isAirgap ) {
-        return this.allRepos?.find(r => r.spec.url === KUBEWARDEN_REPO);
-      }
-
-      return this.controllerChart;
+      return this.charts?.find(chart => chart.chartName === KUBEWARDEN_CHARTS.CONTROLLER);
     },
 
     shellEnabled() {
diff --git a/pkg/kubewarden/components/DefaultsBanner.vue b/pkg/kubewarden/components/DefaultsBanner.vue
index 884aa028..b391fdbf 100644
--- a/pkg/kubewarden/components/DefaultsBanner.vue
+++ b/pkg/kubewarden/components/DefaultsBanner.vue
@@ -30,9 +30,22 @@ export default {
 
   computed: {
     ...mapGetters(['currentCluster']),
+    ...mapGetters({ charts: 'catalog/charts', t: 'i18n/t' }),
 
     defaultsChart() {
-      return this.$store.getters['catalog/chart']({ chartName: KUBEWARDEN_CHARTS.DEFAULTS });
+      if ( this.kubewardenRepo ) {
+        return this.$store.getters['catalog/chart']({
+          repoName:  this.kubewardenRepo.repoName,
+          repoType:  this.kubewardenRepo.repoType,
+          chartName: KUBEWARDEN_CHARTS.DEFAULTS
+        });
+      }
+
+      return null;
+    },
+
+    kubewardenRepo() {
+      return this.charts?.find(chart => chart.chartName === KUBEWARDEN_CHARTS.DEFAULTS);
     },
   },
 
diff --git a/pkg/kubewarden/components/MetricsBanner.vue b/pkg/kubewarden/components/MetricsBanner.vue
index e6e50bd4..11302416 100644
--- a/pkg/kubewarden/components/MetricsBanner.vue
+++ b/pkg/kubewarden/components/MetricsBanner.vue
@@ -39,10 +39,23 @@ export default {
 
   computed: {
     ...mapGetters(['currentProduct']),
+    ...mapGetters({ charts: 'catalog/charts' }),
     ...monitoringStatus(),
 
     monitoringChart() {
-      return this.$store.getters['catalog/chart']({ chartName: 'rancher-monitoring' });
+      if ( this.rancherRepo ) {
+        return this.$store.getters['catalog/chart']({
+          repoName:  this.kubewardenRepo.repoName,
+          repoType:  this.kubewardenRepo.repoType,
+          chartName: 'rancher-monitoring'
+        });
+      }
+
+      return null;
+    },
+
+    rancherRepo() {
+      return this.charts?.find(chart => chart.chartName === 'rancher-monitoring');
     }
   },
 
diff --git a/tests/unit/detail/PolicyServer.spec.ts b/tests/unit/detail/PolicyServer.spec.ts
index ddfdf6f4..6b360ea1 100644
--- a/tests/unit/detail/PolicyServer.spec.ts
+++ b/tests/unit/detail/PolicyServer.spec.ts
@@ -50,7 +50,8 @@ describe('component: PolicyServer', () => {
             currentCluster:                  () => 'current_cluster',
             currentProduct:                  () => 'current_product',
             'current_product/all':           jest.fn(),
-            'i18n/t':                        jest.fn()
+            'i18n/t':                        jest.fn(),
+            'kubewarden/policyTraces':       () => TraceTestData
           },
         }
       },
@@ -111,7 +112,8 @@ describe('component: PolicyServer', () => {
             currentCluster:                  () => 'current_cluster',
             currentProduct:                  () => 'current_product',
             'current_product/all':           jest.fn(),
-            'i18n/t':                        jest.fn()
+            'i18n/t':                        jest.fn(),
+            'kubewarden/policyTraces':       () => TraceTestData
           },
         }
       },
@@ -152,7 +154,8 @@ describe('component: PolicyServer', () => {
             currentCluster:                  () => 'current_cluster',
             currentProduct:                  () => 'current_product',
             'current_product/all':           jest.fn(),
-            'i18n/t':                        jest.fn()
+            'i18n/t':                        jest.fn(),
+            'kubewarden/policyTraces':       () => TraceTestData
           },
         }
       },
diff --git a/tests/unit/templates/policyTraces.js b/tests/unit/templates/policyTraces.js
index cf2b183b..98e9dbe3 100644
--- a/tests/unit/templates/policyTraces.js
+++ b/tests/unit/templates/policyTraces.js
@@ -1,6 +1,7 @@
 export default [
   {
     policyName: 'disallow-np',
+    cluster:    'current_cluster',
     traces:     [
       {
         id:              '8bb0ad38f130c28f544491ea03a10b40',
@@ -32,6 +33,7 @@ export default [
   },
   {
     policyName: 'do-not-run-as-root',
+    cluster:    'current_cluster',
     traces:     [
       {
         id:        '0de3e0c42e65bee1589d712288c50ffc',
@@ -73,6 +75,7 @@ export default [
   },
   {
     policyName: 'do-not-share-host-paths',
+    cluster:    'current_cluster',
     traces:     [
       {
         id:        '6737aab871b84c88e0d72fe9ccd1c0ad',
@@ -90,6 +93,7 @@ export default [
   },
   {
     policyName: 'drop-capabilities',
+    cluster:    'current_cluster',
     traces:     [
       {
         id:        '6b45b47c049c232930506009ea6e3208',
@@ -107,6 +111,7 @@ export default [
   },
   {
     policyName: 'no-host-namespace-sharing',
+    cluster:    'current_cluster',
     traces:     [
       {
         id:        '1032644de83d5e3d19e292f870084dec',
@@ -124,6 +129,7 @@ export default [
   },
   {
     policyName: 'no-privilege-escalation',
+    cluster:    'current_cluster',
     traces:     [
       {
         id:        'd300801925447ca66a605e242c78902e',
@@ -165,6 +171,7 @@ export default [
   },
   {
     policyName: 'no-privileged-pod',
+    cluster:    'current_cluster',
     traces:     [
       {
         id:        '3c9375e05d413606bac9e21d17f1326b',