diff --git a/app/kubernetes/__module.js b/app/kubernetes/__module.js
index 63838f2d31..b1f2b76427 100644
--- a/app/kubernetes/__module.js
+++ b/app/kubernetes/__module.js
@@ -566,15 +566,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
       },
     };
 
-    const volumesBase = {
-      name: 'kubernetes.volumes',
-      url: '/volumes',
-      abstract: true,
-    };
-
     const volumes = {
-      name: 'kubernetes.volumes.index',
-      url: '?tab',
+      name: 'kubernetes.volumes',
+      url: '/volumes?tab',
       views: {
         'content@': {
           component: 'kubernetesVolumesView',
@@ -610,7 +604,7 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
         resourceConfig: {
           title: 'Persistent Volume details',
           breadcrumbLabel: 'Volumes',
-          breadcrumbLink: 'kubernetes.volumes.index',
+          breadcrumbLink: 'kubernetes.volumes',
           breadcrumbTab: 'volumes',
           resourceType: 'persistentvolume',
           apiVersion: 'v1',
@@ -634,7 +628,7 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
         resourceConfig: {
           title: 'Storage Class details',
           breadcrumbLabel: 'Volumes',
-          breadcrumbLink: 'kubernetes.volumes.index',
+          breadcrumbLink: 'kubernetes.volumes',
           breadcrumbTab: 'storage',
           resourceType: 'storageclass',
           apiVersion: 'storage.k8s.io/v1',
@@ -935,7 +929,6 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
     $stateRegistryProvider.register(namespaceCreation);
     $stateRegistryProvider.register(namespace);
     $stateRegistryProvider.register(namespaceAccess);
-    $stateRegistryProvider.register(volumesBase);
     $stateRegistryProvider.register(volumes);
     $stateRegistryProvider.register(volume);
     $stateRegistryProvider.register(persistentVolume);
diff --git a/app/kubernetes/views/volumes/edit/volume.html b/app/kubernetes/views/volumes/edit/volume.html
index 5e8368234c..4dbbdc9db9 100644
--- a/app/kubernetes/views/volumes/edit/volume.html
+++ b/app/kubernetes/views/volumes/edit/volume.html
@@ -8,7 +8,7 @@
       link: 'kubernetes.resourcePools.resourcePool',
       linkParams:{ id: ctrl.volume.ResourcePool.Namespace.Name }
     },
-    { label:'Volumes', link:'kubernetes.volumes.index' },
+    { label:'Volumes', link:'kubernetes.volumes' },
      ctrl.volume.PersistentVolumeClaim.Name,
      ]"
   reload="true"
diff --git a/app/react/kubernetes/dashboard/DashboardView.tsx b/app/react/kubernetes/dashboard/DashboardView.tsx
index 4318df9a23..50a1578396 100644
--- a/app/react/kubernetes/dashboard/DashboardView.tsx
+++ b/app/react/kubernetes/dashboard/DashboardView.tsx
@@ -114,7 +114,7 @@ export function DashboardView() {
             isLoading={volumesCountQuery.isInitialLoading}
             isRefetching={volumesCountQuery.isRefetching}
             icon={Database}
-            to="kubernetes.volumes.index"
+            to="kubernetes.volumes"
             type="Volume"
             data-cy="dashboard-volume"
           />
diff --git a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartValues.ts b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartValues.ts
index 503fb71ae7..867bd6209b 100644
--- a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartValues.ts
+++ b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartValues.ts
@@ -28,7 +28,7 @@ export function useHelmChartValues(params: Params, isLatestVersion = false) {
     select: (data) => ({
       values: data,
     }),
-    retry: 1,
+    retry: 2,
     staleTime: 60 * 1000 * 20, // 60 minutes, because values are not expected to change often
     ...withError('Unable to get Helm chart values'),
   });
diff --git a/app/react/sidebar/KubernetesSidebar/KubernetesSidebar.tsx b/app/react/sidebar/KubernetesSidebar/KubernetesSidebar.tsx
index 432c018ee4..10e8e8e2f6 100644
--- a/app/react/sidebar/KubernetesSidebar/KubernetesSidebar.tsx
+++ b/app/react/sidebar/KubernetesSidebar/KubernetesSidebar.tsx
@@ -96,7 +96,7 @@ export function KubernetesSidebar({ environmentId }: Props) {
       />
 
       <SidebarItem
-        to="kubernetes.volumes.index"
+        to="kubernetes.volumes"
         params={{ endpointId: environmentId }}
         icon={Database}
         label="Volumes"