diff --git a/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts b/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts
index 2b14e04bea..7ee1bcbfb5 100644
--- a/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts
+++ b/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts
@@ -58,7 +58,7 @@ describe("ApiManager", () => {
 
   describe("registerApi", () => {
     it("re-register store if apiBase changed", () => {
-      const apiBase = "apis/v1/foo";
+      const apiBase = "api/v1/foo";
       const fallbackApiBase = "/apis/extensions/v1beta1/foo";
       const kubeApi = new TestApi({
         logger: di.inject(loggerInjectionToken),
diff --git a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
index 78b07d5ca1..d8ea04a8e9 100644
--- a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -81,7 +81,7 @@ exports[`disable kube object detail items when cluster is not relevant given ext
               class="value"
             >
               <a
-                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapi%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
               >
                 some-namespace
               </a>
@@ -702,7 +702,7 @@ exports[`disable kube object detail items when cluster is not relevant given ext
               class="value"
             >
               <a
-                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapi%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
               >
                 some-namespace
               </a>
@@ -1318,7 +1318,7 @@ exports[`disable kube object detail items when cluster is not relevant given not
               class="value"
             >
               <a
-                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapi%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
               >
                 some-namespace
               </a>
diff --git a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
index b8d66959bd..112d33310a 100644
--- a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
+++ b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
@@ -81,7 +81,7 @@ exports[`reactively hide kube object detail item renders 1`] = `
               class="value"
             >
               <a
-                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapi%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
               >
                 some-namespace
               </a>
@@ -697,7 +697,7 @@ exports[`reactively hide kube object detail item when the item is shown renders
               class="value"
             >
               <a
-                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapi%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
               >
                 some-namespace
               </a>
diff --git a/packages/core/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx b/packages/core/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx
index 7b2d25d4c2..e97bd3320d 100644
--- a/packages/core/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx
+++ b/packages/core/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx
@@ -26,7 +26,7 @@ describe("disable kube object detail items when cluster is not relevant", () =>
     builder.afterWindowStart(({ windowDi }) => {
       const apiManager = windowDi.inject(apiManagerInjectable);
       const api = {
-        apiBase: "/apis/some-api-version/some-kind",
+        apiBase: "/api/some-api-version/some-kind",
       } as Partial<KubeApi<KubeObject>> as KubeApi<KubeObject>;
       const store = {
         api,
@@ -66,7 +66,7 @@ describe("disable kube object detail items when cluster is not relevant", () =>
     const windowDi = builder.applicationWindow.only.di;
     const showDetails = windowDi.inject(showDetailsInjectable);
 
-    showDetails("/apis/some-api-version/namespaces/some-namespace/some-kind/some-name");
+    showDetails("/api/some-api-version/namespaces/some-namespace/some-kind/some-name");
 
     builder.extensions.enable(testExtension);
   });
diff --git a/packages/core/src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx b/packages/core/src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx
index c901100bc8..de28061ce2 100644
--- a/packages/core/src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx
+++ b/packages/core/src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx
@@ -29,7 +29,7 @@ describe("reactively hide kube object detail item", () => {
     builder.afterWindowStart(({ windowDi }) => {
       const apiManager = windowDi.inject(apiManagerInjectable);
       const api = {
-        apiBase: "/apis/some-api-version/some-kind",
+        apiBase: "/api/some-api-version/some-kind",
       } as Partial<KubeApi<KubeObject>> as KubeApi<KubeObject>;
       const store = {
         api,
@@ -73,7 +73,7 @@ describe("reactively hide kube object detail item", () => {
     const windowDi = builder.applicationWindow.only.di;
     const showDetails = windowDi.inject(showDetailsInjectable);
 
-    showDetails("/apis/some-api-version/namespaces/some-namespace/some-kind/some-name");
+    showDetails("/api/some-api-version/namespaces/some-namespace/some-kind/some-name");
 
     builder.extensions.enable(testExtension);
   });
@@ -96,7 +96,7 @@ describe("reactively hide kube object detail item", () => {
 
       const apiManager = builder.applicationWindow.only.di.inject(apiManagerInjectable);
 
-      assert(apiManager.getStore("/apis/some-api-version/some-kind"));
+      assert(apiManager.getStore("/api/some-api-version/some-kind"));
     });
 
     it("renders", () => {
diff --git a/packages/core/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap b/packages/core/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
index 6eafa73d66..8bc562a15d 100644
--- a/packages/core/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
+++ b/packages/core/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
@@ -2101,7 +2101,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeChanged: some-changed-value
   someAddedProperty: some-new-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 
               </textarea>
             </div>
@@ -3633,7 +3633,7 @@ metadata:
   uid: some-other-uid
   name: some-other-name
   resourceVersion: some-resource-version
-  selfLink: /apis/some-api-version/namespaces/some-other-uid
+  selfLink: /api/some-api-version/namespaces/some-other-uid
 
               </textarea>
             </div>
@@ -4437,7 +4437,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 
               </textarea>
             </div>
@@ -5964,7 +5964,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 
               </textarea>
             </div>
@@ -6716,7 +6716,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 
               </textarea>
             </div>
@@ -7468,7 +7468,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
   labels:
     k8slens-edit-resource-version: some-api-version
 
@@ -8222,7 +8222,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 
               </textarea>
             </div>
@@ -9570,7 +9570,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 
               </textarea>
             </div>
@@ -10322,7 +10322,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 
               </textarea>
             </div>
@@ -11074,7 +11074,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 
               </textarea>
             </div>
diff --git a/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx b/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx
index 6d0ed13b70..9ceeb46f69 100644
--- a/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx
+++ b/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx
@@ -161,7 +161,7 @@ describe("cluster/namespaces - edit namespace from new tab", () => {
 
           it("calls for namespace", () => {
             expect(apiKubeGetMock).toHaveBeenCalledWith(
-              "/apis/some-api-version/namespaces/some-uid",
+              "/api/some-api-version/namespaces/some-uid",
             );
           });
 
@@ -208,7 +208,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 `);
             });
 
@@ -227,7 +227,7 @@ metadata:
 
               it("calls for save with just the adding version label", () => {
                 expect(apiKubePatchMock).toHaveBeenCalledWith(
-                  "/apis/some-api-version/namespaces/some-uid",
+                  "/api/some-api-version/namespaces/some-uid",
                   {
                     data: [{
                       op: "add",
@@ -509,7 +509,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeChanged: some-changed-value
   someAddedProperty: some-new-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 `,
                   },
                 });
@@ -532,7 +532,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeChanged: some-changed-value
   someAddedProperty: some-new-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 `);
               });
 
@@ -548,7 +548,7 @@ metadata:
                 expect(
                   actual.edit_resource_store["some-first-tab-id"],
                 ).toEqual({
-                  resource: "/apis/some-api-version/namespaces/some-uid",
+                  resource: "/api/some-api-version/namespaces/some-uid",
                   firstDraft: `apiVersion: some-api-version
 kind: Namespace
 metadata:
@@ -557,7 +557,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 `,
                   draft: `apiVersion: some-api-version
 kind: Namespace
@@ -567,7 +567,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeChanged: some-changed-value
   someAddedProperty: some-new-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 `,
                 });
               });
@@ -583,7 +583,7 @@ metadata:
 
                 it("calls for save with changed configuration", () => {
                   expect(apiKubePatchMock).toHaveBeenCalledWith(
-                    "/apis/some-api-version/namespaces/some-uid",
+                    "/api/some-api-version/namespaces/some-uid",
                     {
                       data: [
                         {
@@ -637,7 +637,7 @@ metadata:
   uid: some-uid
   name: some-name
   resourceVersion: some-resource-version
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
   somePropertyToBeChanged: some-changed-value
   someAddedProperty: some-new-value
   someOtherAddedProperty: some-other-new-value
@@ -655,7 +655,7 @@ metadata:
                   fireEvent.click(saveButton);
 
                   expect(apiKubePatchMock).toHaveBeenCalledWith(
-                    "/apis/some-api-version/namespaces/some-uid",
+                    "/api/some-api-version/namespaces/some-uid",
                     {
                       data: [
                         {
@@ -732,7 +732,7 @@ metadata:
   uid: some-uid
   name: some-name
   resourceVersion: some-resource-version
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 `,
                     },
                   });
@@ -794,7 +794,7 @@ metadata:
 
               it("calls for second namespace", () => {
                 expect(apiKubeGetMock).toHaveBeenCalledWith(
-                  "/apis/some-api-version/namespaces/some-other-uid",
+                  "/api/some-api-version/namespaces/some-other-uid",
                 );
               });
 
@@ -811,7 +811,7 @@ metadata:
                       name: "some-other-name",
                       resourceVersion: "some-resource-version",
                       selfLink:
-                        "/apis/some-api-version/namespaces/some-other-uid",
+                        "/api/some-api-version/namespaces/some-other-uid",
                     },
                   });
 
@@ -833,7 +833,7 @@ metadata:
   uid: some-other-uid
   name: some-other-name
   resourceVersion: some-resource-version
-  selfLink: /apis/some-api-version/namespaces/some-other-uid
+  selfLink: /api/some-api-version/namespaces/some-other-uid
 `);
                 });
 
@@ -847,7 +847,7 @@ metadata:
                   fireEvent.click(saveButton);
 
                   expect(apiKubePatchMock).toHaveBeenCalledWith(
-                    "/apis/some-api-version/namespaces/some-other-uid",
+                    "/api/some-api-version/namespaces/some-other-uid",
                     {
                       data: [{
                         op: "add",
@@ -897,7 +897,7 @@ metadata:
                   });
 
                   it("does not call for namespace", () => {
-                    expect(apiKubeGetMock).not.toHaveBeenCalledWith("/apis/some-api-version/namespaces/some-uid");
+                    expect(apiKubeGetMock).not.toHaveBeenCalledWith("/api/some-api-version/namespaces/some-uid");
                   });
 
                   it("has configuration in the editor", () => {
@@ -913,7 +913,7 @@ metadata:
   resourceVersion: some-resource-version
   somePropertyToBeRemoved: some-value
   somePropertyToBeChanged: some-old-value
-  selfLink: /apis/some-api-version/namespaces/some-uid
+  selfLink: /api/some-api-version/namespaces/some-uid
 `);
                   });
 
@@ -927,7 +927,7 @@ metadata:
                     fireEvent.click(saveButton);
 
                     expect(apiKubePatchMock).toHaveBeenCalledWith(
-                      "/apis/some-api-version/namespaces/some-uid",
+                      "/api/some-api-version/namespaces/some-uid",
                       {
                         data: [{
                           op: "add",
@@ -987,7 +987,7 @@ const someNamespaceDataStub = {
     uid: "some-uid",
     name: "some-name",
     resourceVersion: "some-resource-version",
-    selfLink: "/apis/some-api-version/namespaces/some-uid",
+    selfLink: "/api/some-api-version/namespaces/some-uid",
   },
 };
 
@@ -998,6 +998,6 @@ const someOtherNamespaceDataStub = {
     uid: "some-other-uid",
     name: "some-other-name",
     resourceVersion: "some-resource-version",
-    selfLink: "/apis/some-api-version/namespaces/some-other-uid",
+    selfLink: "/api/some-api-version/namespaces/some-other-uid",
   },
 };