diff --git a/.sonarcloud.properties b/.sonarcloud.properties
index 1e778a1e016e..3f096b61189f 100644
--- a/.sonarcloud.properties
+++ b/.sonarcloud.properties
@@ -7,7 +7,7 @@ sonar.projectName=manager
 sonar.sources=.
 sonar.sourceEncoding=UTF-8
 sonar.ws.timeout=60
-sonar.projectVersion=radon-sheep-6
+sonar.projectVersion=neptunium-wildebeest
 
 sonar.exclusions=node_modules/**, **/node_modules/**, **/dist/**, **/semantic/**, **/coverage/**, **/static/**, **/mock/**, **/mockServiceWorker.js
 sonar.coverage.exclusions=**/*.spec.js
diff --git a/packages/manager/apps/dedicated/CHANGELOG.md b/packages/manager/apps/dedicated/CHANGELOG.md
index 9221775b497b..3f4ae32e244d 100644
--- a/packages/manager/apps/dedicated/CHANGELOG.md
+++ b/packages/manager/apps/dedicated/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [19.63.0](https://github.com/ovh/manager/compare/@ovh-ux/manager-dedicated@19.62.2...@ovh-ux/manager-dedicated@19.63.0) (2024-10-29)
+
+
+### Bug Fixes
+
+* **dedicated-cloud:** replace description by name in breadcrumb ([#13249](https://github.com/ovh/manager/issues/13249)) ([b1d1b3a](https://github.com/ovh/manager/commit/b1d1b3a2ceeda15462f28620dc7a789ac0edc92e))
+
+
+### Features
+
+* **dedicated.ip:** navigate user to api console ([#12236](https://github.com/ovh/manager/issues/12236)) ([4df8cb5](https://github.com/ovh/manager/commit/4df8cb5530b0bd280773740ad540b7f29c482c23))
+* **dedicated:** modify the delay message for order confirmation ([#12560](https://github.com/ovh/manager/issues/12560)) ([7fdb3e5](https://github.com/ovh/manager/commit/7fdb3e5078ea921b2bba39bd562277281f507550))
+
+
+
+
+
 ## [19.62.2](https://github.com/ovh/manager/compare/@ovh-ux/manager-dedicated@19.62.1...@ovh-ux/manager-dedicated@19.62.2) (2024-10-24)
 
 
diff --git a/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/datacenter/dashboard/dedicatedCloud-datacenter-dashboard.controller.js b/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/datacenter/dashboard/dedicatedCloud-datacenter-dashboard.controller.js
index f526dfe15fda..8d5d11ec679e 100644
--- a/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/datacenter/dashboard/dedicatedCloud-datacenter-dashboard.controller.js
+++ b/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/datacenter/dashboard/dedicatedCloud-datacenter-dashboard.controller.js
@@ -88,12 +88,6 @@ export default class {
       datacenterId: this.datacenter.model.id,
       destinationId,
       value,
-    }).result.then((newValue) => {
-      if (contextTitle === 'dedicatedCloud_datacenter_name') {
-        this.datacenter.model.name = newValue;
-      } else {
-        this.datacenter.model.description = newValue;
-      }
     });
   }
 }
diff --git a/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.controller.js b/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.controller.js
index 4fc61ea1de35..afe101dc036c 100644
--- a/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.controller.js
+++ b/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.controller.js
@@ -23,8 +23,6 @@ export default class {
         'dedicatedCloud_dashboard_nameModifying_success',
       ),
       value,
-    }).result.then((newDescription) => {
-      this.dedicatedCloud.description = newDescription;
-    });
+    }).result;
   }
 }
diff --git a/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.service.js b/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.service.js
index 4eb065062914..035a50eaf41c 100644
--- a/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.service.js
+++ b/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/dedicatedCloud.service.js
@@ -10,7 +10,6 @@ import isUndefined from 'lodash/isUndefined';
 import set from 'lodash/set';
 import snakeCase from 'lodash/snakeCase';
 import some from 'lodash/some';
-import toNumber from 'lodash/toNumber';
 
 import {
   DEDICATED_CLOUD_CONSTANTS,
@@ -344,59 +343,18 @@ class DedicatedCloudService {
     );
   }
 
-  getDatacenterInformations(serviceName, datacenterId, forceRefresh) {
-    return this.OvhHttp.get(
-      '/sws/dedicatedCloud/{serviceName}/datacenters/{datacenterId}',
-      {
-        rootPath: '2api',
-        urlParams: {
-          serviceName,
-          datacenterId,
-        },
-        cache: 'SUB_DATACENTERS',
-        clearCache: forceRefresh,
-      },
-    );
-  }
-
-  updateDatacenterName(serviceName, datacenterId, name) {
-    return this.OvhHttp.put(
-      '/dedicatedCloud/{serviceName}/datacenter/{datacenterId}',
-      {
-        rootPath: 'apiv6',
-        urlParams: {
-          serviceName,
-          datacenterId,
-        },
-        data: {
-          name,
-        },
-      },
-    );
+  getDatacenterInformations(serviceName, datacenterId) {
+    return this.$http
+      .get(`/sws/dedicatedCloud/${serviceName}/datacenters/${datacenterId}`, {
+        serviceType: 'aapi',
+      })
+      .then(({ data }) => data);
   }
 
-  updateDatacenterDescription(serviceName, datacenterId, description) {
-    return this.OvhHttp.put(
-      '/dedicatedCloud/{serviceName}/datacenter/{datacenterId}',
-      {
-        rootPath: 'apiv6',
-        urlParams: {
-          serviceName,
-          datacenterId,
-        },
-        data: {
-          description,
-        },
-        broadcast: 'global_display_name_change',
-        broadcastParam: {
-          stateParams: {
-            productId: serviceName,
-            datacenterId: toNumber(datacenterId),
-          },
-          displayName: description,
-        },
-      },
-    );
+  updateDatacenterData(serviceName, datacenterId, data) {
+    return this.$http
+      .put(`/dedicatedCloud/${serviceName}/datacenter/${datacenterId}`, data)
+      .then(({ data: result }) => result);
   }
 
   /* ------- SUB DATACENTER HOSTS -------*/
diff --git a/packages/manager/apps/dedicated/client/app/components/name-edition/name-edition.controller.js b/packages/manager/apps/dedicated/client/app/components/name-edition/name-edition.controller.js
index b9ed3cbcdba4..c2075eab0e06 100644
--- a/packages/manager/apps/dedicated/client/app/components/name-edition/name-edition.controller.js
+++ b/packages/manager/apps/dedicated/client/app/components/name-edition/name-edition.controller.js
@@ -4,19 +4,52 @@ angular.module('App').controller(
   'NameEditionCtrl',
   class NameEditionCtrl {
     /* @ngInject */
-    constructor($translate, $uibModalInstance, Alerter, DedicatedCloud, data) {
+    constructor(
+      $translate,
+      $interval,
+      $state,
+      $uibModalInstance,
+      Alerter,
+      DedicatedCloud,
+      data,
+    ) {
       this.$translate = $translate;
+      this.$interval = $interval;
+      this.$state = $state;
       this.$uibModalInstance = $uibModalInstance;
       this.Alerter = Alerter;
       this.DedicatedCloud = DedicatedCloud;
       this.data = data;
+      this.$poll = null;
+    }
+
+    pollTask(taskId) {
+      this.$poll = this.$interval(() => {
+        this.DedicatedCloud.getOperation(this.data.productId, {
+          taskId,
+        })
+          .then(({ state }) => {
+            if (state === 'done') {
+              this.stopPollTask();
+              this.$state.reload();
+            }
+          })
+          .catch(this.stopPollTask);
+      }, 3000);
+    }
+
+    stopPollTask() {
+      if (this.$poll) {
+        this.$interval.cancel(this.$poll);
+        this.$poll = null;
+      }
     }
 
     updateDescription() {
       this.updating = true;
 
       return this.updateName()
-        .then(() => {
+        .then((data) => {
           if (this.data.successText) {
             this.Alerter.success(
               this.data.successText,
@@ -25,6 +58,9 @@ angular.module('App').controller(
           }
 
           this.$uibModalInstance.close(this.newValue);
+          if (data?.taskId) {
+            this.pollTask(data.taskId);
+          }
         })
         .catch((err) => {
           const message = this.$translate.instant(
@@ -59,21 +95,15 @@ angular.module('App').controller(
             );
           break;
         case 'dedicatedCloud_datacenter_name':
-          this.modalContextTitle = 'dedicatedCloud_datacenter_name';
-          this.updateName = () =>
-            this.DedicatedCloud.updateDatacenterName(
-              this.data.productId,
-              this.data.datacenterId,
-              this.newValue,
-            );
-          break;
         case 'dedicatedCloud_datacenter_description':
-          this.modalContextTitle = 'dedicatedCloud_datacenter_description';
+          this.modalContextTitle = this.data.contextTitle;
           this.updateName = () =>
-            this.DedicatedCloud.updateDatacenterDescription(
+            this.DedicatedCloud.updateDatacenterData(
               this.data.productId,
               this.data.datacenterId,
-              this.newValue,
+              this.modalContextTitle.endsWith('name')
+                ? { name: this.newValue }
+                : { description: this.newValue },
             );
           break;
         default:
@@ -82,5 +112,9 @@ angular.module('App').controller(
           break;
       }
     }
+
+    $onDestroy() {
+      this.stopPollTask();
+    }
   },
 );
diff --git a/packages/manager/apps/dedicated/client/app/components/name-edition/name-edition.html b/packages/manager/apps/dedicated/client/app/components/name-edition/name-edition.html
index 94a9078fcba0..b95154d453a1 100644
--- a/packages/manager/apps/dedicated/client/app/components/name-edition/name-edition.html
+++ b/packages/manager/apps/dedicated/client/app/components/name-edition/name-edition.html
@@ -2,7 +2,7 @@
     <form name="updateNameForm" novalidate>
         <oui-modal
             data-primary-label="{{ :: 'common_change' | translate }}"
-            data-primary-disabled="updateNameForm.$invalid"
+            data-primary-disabled="updateNameForm.$invalid || $ctrl.newValue === $ctrl.data.value"
             data-primary-action="$ctrl.updateDescription()"
             data-secondary-label="{{ :: 'common_cancel' | translate }}"
             data-secondary-action="$ctrl.$uibModalInstance.dismiss()"
diff --git a/packages/manager/apps/dedicated/client/app/dedicatedCloud/datacenter/backup/backup.routing.js b/packages/manager/apps/dedicated/client/app/dedicatedCloud/datacenter/backup/backup.routing.js
index f425005db4da..b90fa3627769 100644
--- a/packages/manager/apps/dedicated/client/app/dedicatedCloud/datacenter/backup/backup.routing.js
+++ b/packages/manager/apps/dedicated/client/app/dedicatedCloud/datacenter/backup/backup.routing.js
@@ -77,9 +77,7 @@ export default /* @ngInject */ ($stateProvider) => {
                       ...backup,
                       datacenterId: datacenter.id,
                       datacenterName:
-                        datacenter.description ||
-                        datacenter.displayName ||
-                        datacenter.id.toString(),
+                        datacenter.displayName || datacenter.id.toString(),
                     }),
                 ),
           ),
diff --git a/packages/manager/apps/dedicated/client/app/dedicatedCloud/datacenter/dedicatedCloud-datacenter.routing.js b/packages/manager/apps/dedicated/client/app/dedicatedCloud/datacenter/dedicatedCloud-datacenter.routing.js
index 03fc4f479c5a..273da711b52f 100644
--- a/packages/manager/apps/dedicated/client/app/dedicatedCloud/datacenter/dedicatedCloud-datacenter.routing.js
+++ b/packages/manager/apps/dedicated/client/app/dedicatedCloud/datacenter/dedicatedCloud-datacenter.routing.js
@@ -13,7 +13,6 @@ export default /* @ngInject */ ($stateProvider) => {
         DedicatedCloud.getDatacenterInformations(
           serviceName,
           datacenterId,
-          true,
         ).then((datacenter) => ({
           model: {
             ...datacenter,
@@ -58,7 +57,7 @@ export default /* @ngInject */ ($stateProvider) => {
           'dedicatedCloudDatacenterAlert',
         );
       },
-      breadcrumb: /* @ngInject */ (datacenterId) => datacenterId,
+      breadcrumb: /* @ngInject */ (datacenter) => datacenter.model.name,
     },
   });
 };
diff --git a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_de_DE.json b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_de_DE.json
index f4ff1bab687a..d4fae0361ddf 100644
--- a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_de_DE.json
+++ b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_de_DE.json
@@ -6,5 +6,5 @@
   "ip_byoip_disclaimer_description_point_3": " - dass dieser IP-Adressbereich eine gute Reputation hat.",
   "ip_byoip_disclaimer_confirm_text": "Bestätigen",
   "ip_byoip_disclaimer_cancel_text": "Abbrechen",
-  "ip_byoip_disclaimer_ordering_delay_message": "Bitte beachten Sie, dass dieser Prozess bis zu zwei Wochen in Anspruch nehmen kann. Wir entschuldigen uns für die Unannehmlichkeiten."
+  "ip_byoip_disclaimer_ordering_delay_message": "Bitte beachten Sie, dass dieser Vorgang ungefähr 3 Wochen dauern kann. Wir entschuldigen uns für die Unannehmlichkeiten."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_en_GB.json b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_en_GB.json
index 973f3dbfbdd5..b52d3c68cde8 100644
--- a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_en_GB.json
+++ b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_en_GB.json
@@ -6,5 +6,5 @@
   "ip_byoip_disclaimer_description_point_3": " - This IP address range has a healthy reputation.",
   "ip_byoip_disclaimer_confirm_text": "Confirm",
   "ip_byoip_disclaimer_cancel_text": "Cancel",
-  "ip_byoip_disclaimer_ordering_delay_message": "Please note that this process may take up to two weeks. We apologise for the inconvenience."
+  "ip_byoip_disclaimer_ordering_delay_message": "Please note that this process might take around three weeks. We apologise for the inconvenience."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_es_ES.json b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_es_ES.json
index 784615d27580..516d09a8fe7a 100644
--- a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_es_ES.json
+++ b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_es_ES.json
@@ -6,5 +6,5 @@
   "ip_byoip_disclaimer_description_point_3": " - este rango de direcciones IP tiene una buena reputación.",
   "ip_byoip_disclaimer_confirm_text": "Confirmar",
   "ip_byoip_disclaimer_cancel_text": "Cancelar",
-  "ip_byoip_disclaimer_ordering_delay_message": "Tenga en cuenta que este proceso puede tardar hasta dos semanas. Rogamos disculpe las molestias ocasionadas."
+  "ip_byoip_disclaimer_ordering_delay_message": "Tenga en cuenta que este proceso puede tardar aproximadamente 3 semanas. Rogamos disculpe las molestias ocasionadas."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_fr_CA.json b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_fr_CA.json
index 29539affbaf5..77b03ad27050 100644
--- a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_fr_CA.json
+++ b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_fr_CA.json
@@ -4,7 +4,7 @@
   "ip_byoip_disclaimer_description_point_1": " - Être le propriétaire de la plage d'adresses IP renseignée.",
   "ip_byoip_disclaimer_description_point_2": " - M'engager à faire en sorte que la plage d'adresses IP renseignée ne soit pas annoncée sur Internet par plusieurs réseaux simultanément (multi-homing)",
   "ip_byoip_disclaimer_description_point_3": " - Avoir une réputation saine sur cette plage d'adresses IP",
-  "ip_byoip_disclaimer_ordering_delay_message": "Veuillez noter que ce processus peut prendre jusqu'à deux semaines. Nous vous prions de nous excuser pour ce désagrément.",
+  "ip_byoip_disclaimer_ordering_delay_message": "Veuillez noter que ce processus peut prendre approximativement 3 semaines. Nous vous prions de nous excuser pour ce désagrément.",
   "ip_byoip_disclaimer_confirm_text": "Valider",
   "ip_byoip_disclaimer_cancel_text": "Annuler"
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_fr_FR.json b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_fr_FR.json
index 29539affbaf5..77b03ad27050 100644
--- a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_fr_FR.json
+++ b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_fr_FR.json
@@ -4,7 +4,7 @@
   "ip_byoip_disclaimer_description_point_1": " - Être le propriétaire de la plage d'adresses IP renseignée.",
   "ip_byoip_disclaimer_description_point_2": " - M'engager à faire en sorte que la plage d'adresses IP renseignée ne soit pas annoncée sur Internet par plusieurs réseaux simultanément (multi-homing)",
   "ip_byoip_disclaimer_description_point_3": " - Avoir une réputation saine sur cette plage d'adresses IP",
-  "ip_byoip_disclaimer_ordering_delay_message": "Veuillez noter que ce processus peut prendre jusqu'à deux semaines. Nous vous prions de nous excuser pour ce désagrément.",
+  "ip_byoip_disclaimer_ordering_delay_message": "Veuillez noter que ce processus peut prendre approximativement 3 semaines. Nous vous prions de nous excuser pour ce désagrément.",
   "ip_byoip_disclaimer_confirm_text": "Valider",
   "ip_byoip_disclaimer_cancel_text": "Annuler"
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_it_IT.json b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_it_IT.json
index a4db323911ef..97017e85fb14 100644
--- a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_it_IT.json
+++ b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_it_IT.json
@@ -6,5 +6,5 @@
   "ip_byoip_disclaimer_description_point_3": " - di avere una buona reputazione su questa classe di indirizzi IP",
   "ip_byoip_disclaimer_confirm_text": "Conferma",
   "ip_byoip_disclaimer_cancel_text": "Annulla",
-  "ip_byoip_disclaimer_ordering_delay_message": "Questo processo potrebbe durare fino a due settimane. Ci scusiamo per l'inconveniente."
+  "ip_byoip_disclaimer_ordering_delay_message": "Ti ricordiamo che questo processo potrebbe richiedere circa 3 settimane. Ci scusiamo per l'inconveniente."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_pl_PL.json b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_pl_PL.json
index 0e55e1440110..d238b84dd418 100644
--- a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_pl_PL.json
+++ b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_pl_PL.json
@@ -6,5 +6,5 @@
   "ip_byoip_disclaimer_description_point_3": " - wskazany zakres adresów IP posiada pozytywną reputację",
   "ip_byoip_disclaimer_confirm_text": "Zatwierdź",
   "ip_byoip_disclaimer_cancel_text": "Anuluj",
-  "ip_byoip_disclaimer_ordering_delay_message": "Pamiętaj, że proces ten może potrwać do dwóch tygodni. Przepraszamy za niedogodności."
+  "ip_byoip_disclaimer_ordering_delay_message": "Proces ten może potrwać około 3 tygodni. Przepraszamy za niedogodności."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_pt_PT.json b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_pt_PT.json
index fa9a0dcc870c..e96726c1e0b0 100644
--- a/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_pt_PT.json
+++ b/packages/manager/apps/dedicated/client/app/ip/byoip/disclaimer/translations/Messages_pt_PT.json
@@ -6,5 +6,5 @@
   "ip_byoip_disclaimer_description_point_3": " - Ter boa reputação neste intervalo de endereços IP.",
   "ip_byoip_disclaimer_confirm_text": "Validar",
   "ip_byoip_disclaimer_cancel_text": "Anular",
-  "ip_byoip_disclaimer_ordering_delay_message": "Tenha em conta que este processo pode levar até duas semanas. Pedimos desculpa pelo incómodo."
+  "ip_byoip_disclaimer_ordering_delay_message": "Tenha em conta que este processo pode demorar cerca de 3 semanas. Pedimos desculpa pelo incómodo."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/constants.js b/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/constants.js
index ed9ba4356d24..d04c04b88a55 100644
--- a/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/constants.js
+++ b/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/constants.js
@@ -42,9 +42,12 @@ export const BYOIP_USAGE_GUIDE_URL = {
     'https://help.ovhcloud.com/csm/en-gb-network-bring-your-own-ip?id=kb_article_view&sysparm_article=KB0044849',
 };
 
+export const US_API_CONSOLE_LINK = 'https://api.us.ovhcloud.com/console/';
+
 export default {
   TRACKING_PREFIX_SLICE,
   TRACKING_PREFIX_AGGREGATE,
   BYOIP_SLICE_PARK_IT_FIRST_ERROR_REGEX,
   BYOIP_USAGE_GUIDE_URL,
+  US_API_CONSOLE_LINK,
 };
diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/delete/ip-ip-byoip-delete.controller.js b/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/delete/ip-ip-byoip-delete.controller.js
index a2a03f256c20..ee8d288c28ca 100644
--- a/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/delete/ip-ip-byoip-delete.controller.js
+++ b/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/delete/ip-ip-byoip-delete.controller.js
@@ -1,3 +1,5 @@
+import { US_API_CONSOLE_LINK } from '../constants';
+
 export default class IpByoipDeleteController {
   /* @ngInject */
   constructor($scope, coreURLBuilder) {
@@ -11,6 +13,7 @@ export default class IpByoipDeleteController {
       'dedicated',
       '#/billing/autorenew',
     );
+    this.apiConsoleUrl = US_API_CONSOLE_LINK;
     this.cancelAction = () => {
       this.$scope.resetAction();
     };
diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/delete/ip-ip-byoip-delete.html b/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/delete/ip-ip-byoip-delete.html
index fd4d82a0813d..ff420fcbe10b 100644
--- a/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/delete/ip-ip-byoip-delete.html
+++ b/packages/manager/apps/dedicated/client/app/ip/components/list/byoip/delete/ip-ip-byoip-delete.html
@@ -5,8 +5,8 @@
         on-dismiss="$ctrl.cancelAction()"
     >
         <p
-            data-translate="ip_byoip_delete_block_description"
-            data-translate-values="{ link: $ctrl.serviceLink }"
+            data-translate="{{'ip_byoip_delete_block_description' + ($ctrl.data.isDeleteByoipServiceAvailable ? '_info1' : '_info2')}}"
+            data-translate-values="{ link: ($ctrl.data.isDeleteByoipServiceAvailable ? $ctrl.serviceLink : $ctrl.apiConsoleUrl) }"
         ></p>
     </oui-modal>
 </div>
diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/list.component.js b/packages/manager/apps/dedicated/client/app/ip/components/list/list.component.js
index ad0e738e0c06..19d670688c8d 100644
--- a/packages/manager/apps/dedicated/client/app/ip/components/list/list.component.js
+++ b/packages/manager/apps/dedicated/client/app/ip/components/list/list.component.js
@@ -20,6 +20,7 @@ export default {
     trackPage: '<',
     trackingData: '<',
     goToStatistics: '<',
+    isDeleteByoipServiceAvailable: '<',
   },
   transclude: {
     actions: '?ipListActions',
diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/list.controller.js b/packages/manager/apps/dedicated/client/app/ip/components/list/list.controller.js
index 03888044e492..8d3bdcf801be 100644
--- a/packages/manager/apps/dedicated/client/app/ip/components/list/list.controller.js
+++ b/packages/manager/apps/dedicated/client/app/ip/components/list/list.controller.js
@@ -145,6 +145,7 @@ export default class IpListController {
       $scope.params = self.params || null;
       $scope.isAdditionalIp = self.isAdditionalIp;
       $scope.isAdmin = coreConfig.getUser().auth?.roles?.includes(ADMIN_ROLE);
+      $scope.isDeleteByoipServiceAvailable = self.isDeleteByoipServiceAvailable;
 
       $scope.tracking = {
         'enable-permanent-mitigation': `${TRACKING_PREFIX}::enable-permanent-mitigation`,
diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/popover/ipBlock.html b/packages/manager/apps/dedicated/client/app/ip/components/list/popover/ipBlock.html
index 730b67f60a93..e577fc238730 100644
--- a/packages/manager/apps/dedicated/client/app/ip/components/list/popover/ipBlock.html
+++ b/packages/manager/apps/dedicated/client/app/ip/components/list/popover/ipBlock.html
@@ -117,7 +117,7 @@
             <button
                 type="button"
                 class="btn btn-link"
-                data-ng-click="setAction('ip/byoip/delete/ip-ip-byoip-delete', { ipBlock: ipBlock }, 'info')"
+                data-ng-click="setAction('ip/byoip/delete/ip-ip-byoip-delete', { ipBlock: ipBlock, isDeleteByoipServiceAvailable }, 'info')"
                 data-oui-tooltip="{{ !ipBlock.canBeTerminated ? ('ip_failover_impossible_delete' | translate) : '' }}"
                 data-oui-tooltip-placement="left"
                 data-ng-bind=":: ('ip_table_manage_delete_ipblock' | translate) + ADDITIONAL_IP"
diff --git a/packages/manager/apps/dedicated/client/app/ip/ip.routing.js b/packages/manager/apps/dedicated/client/app/ip/ip.routing.js
index 16882694c3c8..6c8c88d7c203 100644
--- a/packages/manager/apps/dedicated/client/app/ip/ip.routing.js
+++ b/packages/manager/apps/dedicated/client/app/ip/ip.routing.js
@@ -11,6 +11,7 @@ import {
 } from './ip.constant';
 
 const allowByoipFeatureName = 'ip:byoip';
+const allowDeleteByoipService = 'ip:deleteByoipService';
 
 export const listRouting = {
   reloadOnSearch: false,
@@ -143,6 +144,12 @@ export default /* @ngInject */ ($stateProvider) => {
         ovhFeatureFlipping
           .checkFeatureAvailability(allowByoipFeatureName)
           .then((feature) => feature.isFeatureAvailable(allowByoipFeatureName)),
+      isDeleteByoipServiceAvailable: /* @ngInject */ (ovhFeatureFlipping) =>
+        ovhFeatureFlipping
+          .checkFeatureAvailability(allowDeleteByoipService)
+          .then((feature) =>
+            feature.isFeatureAvailable(allowDeleteByoipService),
+          ),
       goToByoipConfiguration: /* @ngInject */ ($state) => () => {
         return $state.go('app.ip.byoip');
       },
diff --git a/packages/manager/apps/dedicated/client/app/ip/ip/ip-ip.controller.js b/packages/manager/apps/dedicated/client/app/ip/ip/ip-ip.controller.js
index 9871a213cae9..ae28482a6c01 100644
--- a/packages/manager/apps/dedicated/client/app/ip/ip/ip-ip.controller.js
+++ b/packages/manager/apps/dedicated/client/app/ip/ip/ip-ip.controller.js
@@ -25,6 +25,7 @@ export default /* @ngInject */
   Ip,
   trackClick,
   isByoipAvailable,
+  isDeleteByoipServiceAvailable,
   goToGameFirewall,
   orderIpAvailable,
   trackPage,
@@ -43,6 +44,7 @@ export default /* @ngInject */
   $scope.goToOrganisation = goToOrganisation;
   $scope.goToVrack = goToVrack;
   $scope.isByoipAvailable = isByoipAvailable;
+  $scope.isDeleteByoipServiceAvailable = isDeleteByoipServiceAvailable;
   $scope.orderIpAvailable = orderIpAvailable;
   $scope.selection = { service: null, serviceType: null };
   $scope.listParams = {};
diff --git a/packages/manager/apps/dedicated/client/app/ip/ip/ip-ip.html b/packages/manager/apps/dedicated/client/app/ip/ip/ip-ip.html
index 5fc735526ef2..98537dfc4c10 100644
--- a/packages/manager/apps/dedicated/client/app/ip/ip/ip-ip.html
+++ b/packages/manager/apps/dedicated/client/app/ip/ip/ip-ip.html
@@ -22,6 +22,7 @@ <h4 data-translate="ip_addresses_grid_header"></h4>
         data-params="listParams"
         data-on-param-deleted="onListParamDeleted(param)"
         data-go-to-statistics="goToStatistics"
+        data-is-delete-byoip-service-available="isDeleteByoipServiceAvailable"
     >
         <ip-list-header>
             <div class="d-flex flex-column flex-lg-row">
diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_de_DE.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_de_DE.json
index a741b2ceb44c..667724c950a6 100644
--- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_de_DE.json
+++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_de_DE.json
@@ -773,5 +773,7 @@
   "ip_table_manage_modify_ipv6block_reverse": "Reverse ändern",
   "ip_filter_services_title_parking": "Parking",
   "ip_virtualmac_not_available_failure": "Die virtuelle MAC wird ab Dezember 2024 auf diesem Server verfügbar sein.",
-  "ip_virtualmac_not_available_failure_details": "Weitere Informationen zur Verwaltung von IPs und virtuellen MACs mit OVHcloud finden Sie in den Guides zur Netzwerkkonfiguration unter {{proxmoxLink}} und {{windowsServerLink}}. In diesem Dokument wird erläutert, wie Sie Ihre OVHcloud Server für die Optimierung der Netzwerkleistung in virtualisierten Umgebungen mit Proxmox VE konfigurieren und dabei Techniken wie das Routing zusätzlicher IP-Adressen über das vRack verwenden​."
+  "ip_virtualmac_not_available_failure_details": "Weitere Informationen zur Verwaltung von IPs und virtuellen MACs mit OVHcloud finden Sie in den Guides zur Netzwerkkonfiguration unter {{proxmoxLink}} und {{windowsServerLink}}. In diesem Dokument wird erläutert, wie Sie Ihre OVHcloud Server für die Optimierung der Netzwerkleistung in virtualisierten Umgebungen mit Proxmox VE konfigurieren und dabei Techniken wie das Routing zusätzlicher IP-Adressen über das vRack verwenden​.",
+  "ip_byoip_delete_block_description_info1": "Dieser IP-Block ist Teil eines größeren BYOIP-Blocks. Wenn Sie Ihren BYOIP-Dienst kündigen möchten, öffnen Sie <a href='{{ link }}'>Meine Dienste</a> und wählen Sie die Option zum Kündigen aus.",
+  "ip_byoip_delete_block_description_info2": "Dieser IP-Block ist Teil eines größeren BYOIP-Blocks. Bitte verwenden Sie die API <a href=\"{{ link }}\" target=\"_blank\">(link)</a>, wenn Sie Ihren BYOIP-Dienst kündigen möchten."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_en_GB.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_en_GB.json
index 05537061e098..652302c78d38 100644
--- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_en_GB.json
+++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_en_GB.json
@@ -773,5 +773,7 @@
   "ip_table_manage_modify_ipv6block_reverse": "Modify the reverse path",
   "ip_filter_services_title_parking": "Parking",
   "ip_virtualmac_not_available_failure": "The virtual MAC address will be available on this server from December 2024",
-  "ip_virtualmac_not_available_failure_details": "For more information on managing IPs and virtual MACs with OVHcloud, please refer to the Network Configuration guides, here: {{proxmoxLink}} and here: {{windowsServerLink}}. This guide provides instructions for configuring your OVHcloud servers to optimise network performance in virtualised environments with Proxmox VE. This is done using techniques like routing additional IPs via the vRack​."
+  "ip_virtualmac_not_available_failure_details": "For more information on managing IPs and virtual MACs with OVHcloud, please refer to the Network Configuration guides, here: {{proxmoxLink}} and here: {{windowsServerLink}}. This guide provides instructions for configuring your OVHcloud servers to optimise network performance in virtualised environments with Proxmox VE. This is done using techniques like routing additional IPs via the vRack​.",
+  "ip_byoip_delete_block_description_info1": "This IP block is part of a larger BYOIP block. If you wish to cancel your BYOIP service, please go to ‘<a href='{{ link }}'>My Services</a>’ and select “Terminate”",
+  "ip_byoip_delete_block_description_info2": "This IP block is part of a larger BYOIP block. If you want to cancel your BYOIP service, use this API <a href=\"{{ link }}\" target=\"_blank\">(link)</a>."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_es_ES.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_es_ES.json
index 5705df468e04..c3a73f3b3c0e 100644
--- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_es_ES.json
+++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_es_ES.json
@@ -773,5 +773,7 @@
   "ip_table_manage_modify_ipv6block_reverse": "Cambiar el registro inverso",
   "ip_filter_services_title_parking": "Parking",
   "ip_virtualmac_not_available_failure": "La MAC virtual estará disponible en este servidor a partir de diciembre de 2024.",
-  "ip_virtualmac_not_available_failure_details": "Para más información sobre la gestión de las IP y las MAC virtuales con OVHcloud, consulte la guía de configuración de red en {{proxmoxLink}} y {{windowsServerLink}}. Este documento explica cómo configurar los servidores de OVHcloud para optimizar el rendimiento de red en entornos virtualizados con Proxmox VE, utilizando técnicas como el enrutamiento de las IP adicionales a través del vRack​."
+  "ip_virtualmac_not_available_failure_details": "Para más información sobre la gestión de las IP y las MAC virtuales con OVHcloud, consulte la guía de configuración de red en {{proxmoxLink}} y {{windowsServerLink}}. Este documento explica cómo configurar los servidores de OVHcloud para optimizar el rendimiento de red en entornos virtualizados con Proxmox VE, utilizando técnicas como el enrutamiento de las IP adicionales a través del vRack​.",
+  "ip_byoip_delete_block_description_info1": "Este bloque de IP forma parte de un bloque BYOIP más grande. Por favor, acceda a <a href='{{ link }}'>Mis servicios</a> para cancelar su servicio BYOIP.",
+  "ip_byoip_delete_block_description_info2": "Este bloque de IP forma parte de un bloque BYOIP más grande. Por favor, utilice la API <a href=\"{{ link }}\" target=\"_blank\">(link)</a> para cancelar su servicio BYOIP."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_CA.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_CA.json
index d56486371395..16c738d0780d 100644
--- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_CA.json
+++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_CA.json
@@ -246,7 +246,8 @@
   "ip_byoip_aggregate_slicing_not_available_error_message": "Aucune configuration de segmentation/agrégation disponible. Pour plus d’informations, veuillez consulter notre guide : <a href=\"{{ url }}\" target=\"_blank\" rel=\"noopener\">ici</a>",
   "ip_byoip_aggregate_ip_doesnt_exist_error_message": "Une autre action de segmentation ou d'agrégation a été effectuée pour cette adresse IP.",
   "ip_byoip_delete_block_title": "Supprimer le bloc",
-  "ip_byoip_delete_block_description": "Ce bloc d'IP fait partie d'un plus grand bloc BYOIP. Veuillez vous rendre sur <a href='{{ link }}'>mes services</a> et choisir `résilier` si vous souhaitez annuler votre service BYOIP",
+  "ip_byoip_delete_block_description_info1": "Ce bloc d'IP fait partie d'un plus grand bloc BYOIP. Veuillez vous rendre sur <a href='{{ link }}'>mes services</a> et choisir `résilier` si vous souhaitez annuler votre service BYOIP.",
+  "ip_byoip_delete_block_description_info2": "Ce bloc IP fait partie d'un plus grand bloc BYOIP. Veuillez utiliser l'API <a href=\"{{ link }}\" target=\"_blank\">(link)</a> si vous souhaitez annuler votre service BYOIP.",
   "ip_edit_or_assosiate_description": "Cette section vous permet de personnaliser les informations publiques sur votre bloc IP (informations présentes sur la base whois).",
   "ip_edit_or_assosiate_title": "Voir/Modifier les informations sur le bloc IP",
   "ip_edit_or_assosiate_network_tab": "Réseau",
diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json
index d56486371395..16c738d0780d 100644
--- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json
+++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json
@@ -246,7 +246,8 @@
   "ip_byoip_aggregate_slicing_not_available_error_message": "Aucune configuration de segmentation/agrégation disponible. Pour plus d’informations, veuillez consulter notre guide : <a href=\"{{ url }}\" target=\"_blank\" rel=\"noopener\">ici</a>",
   "ip_byoip_aggregate_ip_doesnt_exist_error_message": "Une autre action de segmentation ou d'agrégation a été effectuée pour cette adresse IP.",
   "ip_byoip_delete_block_title": "Supprimer le bloc",
-  "ip_byoip_delete_block_description": "Ce bloc d'IP fait partie d'un plus grand bloc BYOIP. Veuillez vous rendre sur <a href='{{ link }}'>mes services</a> et choisir `résilier` si vous souhaitez annuler votre service BYOIP",
+  "ip_byoip_delete_block_description_info1": "Ce bloc d'IP fait partie d'un plus grand bloc BYOIP. Veuillez vous rendre sur <a href='{{ link }}'>mes services</a> et choisir `résilier` si vous souhaitez annuler votre service BYOIP.",
+  "ip_byoip_delete_block_description_info2": "Ce bloc IP fait partie d'un plus grand bloc BYOIP. Veuillez utiliser l'API <a href=\"{{ link }}\" target=\"_blank\">(link)</a> si vous souhaitez annuler votre service BYOIP.",
   "ip_edit_or_assosiate_description": "Cette section vous permet de personnaliser les informations publiques sur votre bloc IP (informations présentes sur la base whois).",
   "ip_edit_or_assosiate_title": "Voir/Modifier les informations sur le bloc IP",
   "ip_edit_or_assosiate_network_tab": "Réseau",
diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_it_IT.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_it_IT.json
index 56b018f02218..2718213dcd2e 100644
--- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_it_IT.json
+++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_it_IT.json
@@ -773,5 +773,7 @@
   "ip_table_manage_modify_ipv6block_reverse": "Modificare il reverse",
   "ip_filter_services_title_parking": "Parking",
   "ip_virtualmac_not_available_failure": "Il MAC virtuale sarà disponibile su questo server a partire da dicembre 2024.",
-  "ip_virtualmac_not_available_failure_details": "Per maggiori informazioni sulla gestione degli IP e dei MAC virtuali con OVHcloud, consulta la guida alla configurazione di rete su {{proxmoxLink}} e {{windowsServerLink}}. Questo documento spiega come configurare i tuoi server OVHcloud per ottimizzare le prestazioni di rete in ambienti virtualizzati con Proxmox VE, utilizzando tecniche come il routing degli IP supplementari tramite la vRack."
+  "ip_virtualmac_not_available_failure_details": "Per maggiori informazioni sulla gestione degli IP e dei MAC virtuali con OVHcloud, consulta la guida alla configurazione di rete su {{proxmoxLink}} e {{windowsServerLink}}. Questo documento spiega come configurare i tuoi server OVHcloud per ottimizzare le prestazioni di rete in ambienti virtualizzati con Proxmox VE, utilizzando tecniche come il routing degli IP supplementari tramite la vRack.",
+  "ip_byoip_delete_block_description_info1": "Questo blocco IP fa parte di un blocco BYOIP più grande. Per annullare il tuo servizio BYOIP, accedi alla sezione <a href='{{ link }}'>I miei servizi</a> e seleziona `Disattivare`.",
+  "ip_byoip_delete_block_description_info2": "Questo blocco IP fa parte di un blocco BYOIP più grande. Per annullare il tuo servizio BYOIP, utilizza l'API <a href=\"{{ link }}\" target=\"_blank\">(link)</a>."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pl_PL.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pl_PL.json
index a5cbad1559bf..d770991692fb 100644
--- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pl_PL.json
+++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pl_PL.json
@@ -773,5 +773,7 @@
   "ip_table_manage_modify_ipv6block_reverse": "Zmień rewers",
   "ip_filter_services_title_parking": "Parking",
   "ip_virtualmac_not_available_failure": "Wirtualny adres MAC będzie dostępny na tym serwerze od grudnia 2024",
-  "ip_virtualmac_not_available_failure_details": "Aby uzyskać więcej informacji na temat zarządzania wirtualnymi adresami IP i MAC w OVHcloud, zapoznaj się z przewodnikami konfiguracji sieci: {{proxmoxLink}} i {{windowsServerLink}}. Dokument ten wyjaśnia, jak skonfigurować serwery OVHcloud w celu zoptymalizowania wydajności sieci w środowiskach zwirtualizowanych przy użyciu Proxmox VE, za pomocą technik, takich jak routing dodatkowych adresów IP przez vRack."
+  "ip_virtualmac_not_available_failure_details": "Aby uzyskać więcej informacji na temat zarządzania wirtualnymi adresami IP i MAC w OVHcloud, zapoznaj się z przewodnikami konfiguracji sieci: {{proxmoxLink}} i {{windowsServerLink}}. Dokument ten wyjaśnia, jak skonfigurować serwery OVHcloud w celu zoptymalizowania wydajności sieci w środowiskach zwirtualizowanych przy użyciu Proxmox VE, za pomocą technik, takich jak routing dodatkowych adresów IP przez vRack.",
+  "ip_byoip_delete_block_description_info1": "Ten blok IP jest częścią większego bloku BYOIP. Przejdź do sekcji <a href='{{ link }}'>Moje usługi</a> i wybierz opcję „Rezygnacja”, jeśli chcesz anulować usługę BYOIP.",
+  "ip_byoip_delete_block_description_info2": "Ten blok IP jest częścią większego bloku BYOIP. Skorzystaj z API <a href=\"{{ link }}\" target=\"_blank\">(link)</a>, jeśli chcesz anulować usługę BYOIP."
 }
diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pt_PT.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pt_PT.json
index ef63d61d53f8..48af3503146b 100644
--- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pt_PT.json
+++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pt_PT.json
@@ -773,5 +773,7 @@
   "ip_table_manage_modify_ipv6block_reverse": "Modificar a reverse",
   "ip_filter_services_title_parking": "Parking",
   "ip_virtualmac_not_available_failure": "O MAC virtual estará disponível neste servidor a partir de dezembro de 2024",
-  "ip_virtualmac_not_available_failure_details": "Para mais informações sobre a gestão dos IP e dos MAC virtuais com a OVHcloud, consulte os Guias de configuração de rede em {{proxmoxLink}} e {{windowsServerLink}}. Este documento explica como configurar os seus servidores OVHcloud para otimizar os desempenhos de rede em ambientes virtualizados com Proxmox VE, utilizando técnicas como o encaminhamento dos IP suplementares através do vRack."
+  "ip_virtualmac_not_available_failure_details": "Para mais informações sobre a gestão dos IP e dos MAC virtuais com a OVHcloud, consulte os Guias de configuração de rede em {{proxmoxLink}} e {{windowsServerLink}}. Este documento explica como configurar os seus servidores OVHcloud para otimizar os desempenhos de rede em ambientes virtualizados com Proxmox VE, utilizando técnicas como o encaminhamento dos IP suplementares através do vRack.",
+  "ip_byoip_delete_block_description_info1": "Este bloco de IP faz parte de um maior bloco BYOIP. Aceda a <a href='{{ link }}'>Os meus serviços</a> e escolha a opção \"rescindir\" se pretender rescindir o seu serviço BYOIP.",
+  "ip_byoip_delete_block_description_info2": "Este bloco IP faz parte de um maior bloco BYOIP. Utilize a API <a href=\"{{ link }}\" target=\"_blank\">(link)</a> se desejar rescindir o seu serviço BYOIP."
 }
diff --git a/packages/manager/apps/dedicated/client/app/managedBaremetal/datacenter/datacenter.routing.js b/packages/manager/apps/dedicated/client/app/managedBaremetal/datacenter/datacenter.routing.js
index d6616ce2bdcb..27257507bc2c 100644
--- a/packages/manager/apps/dedicated/client/app/managedBaremetal/datacenter/datacenter.routing.js
+++ b/packages/manager/apps/dedicated/client/app/managedBaremetal/datacenter/datacenter.routing.js
@@ -13,7 +13,6 @@ export default /* @ngInject */ ($stateProvider) => {
         DedicatedCloud.getDatacenterInformations(
           serviceName,
           datacenterId,
-          true,
         ).then((datacenter) => ({
           model: {
             ...datacenter,
@@ -65,7 +64,7 @@ export default /* @ngInject */ ($stateProvider) => {
           'dedicatedCloudDatacenterAlert',
         );
       },
-      breadcrumb: /* @ngInject */ (datacenterId) => datacenterId,
+      breadcrumb: /* @ngInject */ (datacenter) => datacenter.model.name,
       trackClick: /* @ngInject */ (atInternet, trackingPrefix) => (click) => {
         atInternet.trackClick({
           name: `${trackingPrefix}::details::${click}`,
diff --git a/packages/manager/apps/dedicated/package.json b/packages/manager/apps/dedicated/package.json
index 9f5fc091e974..cef38ebf8e07 100644
--- a/packages/manager/apps/dedicated/package.json
+++ b/packages/manager/apps/dedicated/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ovh-ux/manager-dedicated",
-  "version": "19.62.2",
+  "version": "19.63.0",
   "private": true,
   "description": "OVHcloud Dedicated control panel.",
   "repository": {
@@ -42,7 +42,7 @@
     "@ovh-ux/manager-metrics": "^1.6.1",
     "@ovh-ux/manager-models": "^1.14.17",
     "@ovh-ux/manager-nasha": "^2.16.3",
-    "@ovh-ux/manager-netapp": "^1.15.5",
+    "@ovh-ux/manager-netapp": "^1.16.0",
     "@ovh-ux/manager-ng-layout-helpers": "^2.9.1",
     "@ovh-ux/manager-nutanix": "^1.21.5",
     "@ovh-ux/manager-support": "^1.23.5",
diff --git a/packages/manager/apps/hub-react/CHANGELOG.md b/packages/manager/apps/hub-react/CHANGELOG.md
index 003f46a97bac..9ec7cf1eec75 100644
--- a/packages/manager/apps/hub-react/CHANGELOG.md
+++ b/packages/manager/apps/hub-react/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.3](https://github.com/ovh/manager/compare/@ovh-ux/manager-hub-react-app@0.1.2...@ovh-ux/manager-hub-react-app@0.1.3) (2024-10-29)
+
+
+### Bug Fixes
+
+* **hub:** added content language header on notification call ([2e51d09](https://github.com/ovh/manager/commit/2e51d09103d5f0a6e5aa05055fa221e46280df19))
+* **hub:** align dropdown menu items to the left ([f290dc3](https://github.com/ovh/manager/commit/f290dc3639b31774224c3babd28acde87995be7e))
+
+
+
+
+
 ## [0.1.2](https://github.com/ovh/manager/compare/@ovh-ux/manager-hub-react-app@0.1.1...@ovh-ux/manager-hub-react-app@0.1.2) (2024-10-24)
 
 
diff --git a/packages/manager/apps/hub-react/package.json b/packages/manager/apps/hub-react/package.json
index cac7bf3c858b..06f390956965 100644
--- a/packages/manager/apps/hub-react/package.json
+++ b/packages/manager/apps/hub-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ovh-ux/manager-hub-react-app",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "private": true,
   "description": "OVHcloud Dashboard control panel.",
   "repository": {
diff --git a/packages/manager/apps/hub-react/src/billing/components/services-actions/ServicesActions.component.tsx b/packages/manager/apps/hub-react/src/billing/components/services-actions/ServicesActions.component.tsx
index a861904bf09f..ca11fbb33bf5 100644
--- a/packages/manager/apps/hub-react/src/billing/components/services-actions/ServicesActions.component.tsx
+++ b/packages/manager/apps/hub-react/src/billing/components/services-actions/ServicesActions.component.tsx
@@ -79,7 +79,10 @@ export default function ServicesActions({
           {items.map((item, index) => {
             const { disabled, external, ...link } = item;
             return (
-              <div key={`service_action_${service.domain}_${index}`}>
+              <div
+                className="text-left"
+                key={`service_action_${service.domain}_${index}`}
+              >
                 {index > 0 && <OsdsDivider size={ODS_DIVIDER_SIZE.four} />}
                 <OsdsLink
                   color={ODS_THEME_COLOR_INTENT.primary}
diff --git a/packages/manager/apps/hub-react/src/data/api/notifications.ts b/packages/manager/apps/hub-react/src/data/api/notifications.ts
index 6b5d45b1570f..80e13829078a 100644
--- a/packages/manager/apps/hub-react/src/data/api/notifications.ts
+++ b/packages/manager/apps/hub-react/src/data/api/notifications.ts
@@ -1,4 +1,5 @@
 import { aapi } from '@ovh-ux/manager-core-api';
+import i18next from 'i18next';
 import { ApiEnvelope } from '@/types/apiEnvelope.type';
 import { Notification, NotificationsList } from '@/types/notifications.type';
 
@@ -7,6 +8,11 @@ const hubNotificationStatuses = ['warning', 'error'];
 export const getNotifications: () => Promise<Notification[]> = async () => {
   const { data } = await aapi.get<ApiEnvelope<NotificationsList>>(
     `/hub/notifications`,
+    {
+      headers: {
+        'Content-Language': i18next.language.replace('-', '_'),
+      },
+    },
   );
   return (
     data.data?.notifications.data || []
diff --git a/packages/manager/apps/hub-react/src/data/hooks/notifications/useNotifications.spec.tsx b/packages/manager/apps/hub-react/src/data/hooks/notifications/useNotifications.spec.tsx
index 82a41d227aaa..3f399c431635 100644
--- a/packages/manager/apps/hub-react/src/data/hooks/notifications/useNotifications.spec.tsx
+++ b/packages/manager/apps/hub-react/src/data/hooks/notifications/useNotifications.spec.tsx
@@ -12,6 +12,11 @@ const queryClient = new QueryClient();
 const wrapper = ({ children }: PropsWithChildren) => (
   <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
 );
+vi.mock('i18next', () => ({
+  default: {
+    language: 'fr_FR',
+  },
+}));
 
 describe('useFetchHubNotifications', () => {
   it('should return notifications after extracting them from api envelope', async () => {
diff --git a/packages/manager/apps/hub-react/src/pages/layout.test.tsx b/packages/manager/apps/hub-react/src/pages/layout.test.tsx
deleted file mode 100644
index 385521f1738b..000000000000
--- a/packages/manager/apps/hub-react/src/pages/layout.test.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import { describe, expect, it, vi } from 'vitest';
-import { render } from '@testing-library/react';
-import '@testing-library/jest-dom';
-import * as reactShellClientModule from '@ovh-ux/manager-react-shell-client';
-import {
-  ShellContext,
-  ShellContextType,
-} from '@ovh-ux/manager-react-shell-client';
-import Layout from '@/pages/layout';
-
-const shellContext = {
-  environment: {
-    getUser: vi.fn(),
-  },
-  shell: {
-    ux: {
-      hidePreloader: vi.fn(),
-    },
-  },
-};
-
-const renderComponent = () =>
-  render(
-    <ShellContext.Provider
-      value={(shellContext as unknown) as ShellContextType}
-    >
-      <Layout />
-    </ShellContext.Provider>,
-  );
-
-const mockPath = '/foo';
-
-vi.mock('react-router-dom', () => ({
-  useLocation: () => ({
-    pathname: mockPath,
-  }),
-}));
-
-vi.mock('@ovh-ux/manager-react-shell-client', async (importOriginal) => {
-  const original: typeof reactShellClientModule = await importOriginal();
-  return {
-    ...original,
-    useOvhTracking: vi.fn(() => ({
-      trackPage: vi.fn(),
-      trackClick: vi.fn(),
-      trackCurrentPage: vi.fn(),
-      usePageTracking: vi.fn(),
-    })),
-    useRouteSynchro: vi.fn(() => {}),
-  };
-});
-
-describe('Form.page', () => {
-  it('should render select LegalForms correctly when the sub is FR and legalForms is other', async () => {
-    const { getByText } = renderComponent();
-
-    expect(getByText('Layout')).not.toBeNull();
-  });
-});
diff --git a/packages/manager/apps/hub-react/src/pages/layout.tsx b/packages/manager/apps/hub-react/src/pages/layout.tsx
deleted file mode 100644
index 2255576cefc8..000000000000
--- a/packages/manager/apps/hub-react/src/pages/layout.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React, { useEffect, useContext } from 'react';
-import { defineCurrentPage } from '@ovh-ux/request-tagger';
-import { useLocation } from 'react-router-dom';
-import {
-  useOvhTracking,
-  useRouteSynchro,
-  ShellContext,
-} from '@ovh-ux/manager-react-shell-client';
-
-export default function Layout() {
-  const location = useLocation();
-  const { shell } = useContext(ShellContext);
-  const { trackCurrentPage } = useOvhTracking();
-  useRouteSynchro();
-
-  useEffect(() => {
-    defineCurrentPage(`app.dashboard`);
-  }, []);
-
-  useEffect(() => {
-    trackCurrentPage();
-  }, [location]);
-
-  useEffect(() => {
-    shell.ux.hidePreloader();
-  }, []);
-
-  return <div>Layout</div>;
-}
diff --git a/packages/manager/apps/key-management-service/CHANGELOG.md b/packages/manager/apps/key-management-service/CHANGELOG.md
index 482e1cdfdd13..0d2c52fadc37 100644
--- a/packages/manager/apps/key-management-service/CHANGELOG.md
+++ b/packages/manager/apps/key-management-service/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.10.0](https://github.com/ovh/manager/compare/@ovh-ux/manager-key-management-service-app@0.9.5...@ovh-ux/manager-key-management-service-app@0.10.0) (2024-10-29)
+
+
+### Bug Fixes
+
+* **kms:** add clear notifications before trigger new notif ([#13629](https://github.com/ovh/manager/issues/13629)) ([57be199](https://github.com/ovh/manager/commit/57be199729b6bedeac98df86665d514d13105504))
+* **kms:** lean ([#13788](https://github.com/ovh/manager/issues/13788)) ([3979308](https://github.com/ovh/manager/commit/397930811507f1be72a074805615d7ac0728cf30))
+
+
+### Features
+
+* **key-management-service:** update US guide link ([#13757](https://github.com/ovh/manager/issues/13757)) ([bc5154e](https://github.com/ovh/manager/commit/bc5154ef586b93fe5d343f34b25e6099c4368637))
+
+
+
+
+
 ## [0.9.5](https://github.com/ovh/manager/compare/@ovh-ux/manager-key-management-service-app@0.9.4...@ovh-ux/manager-key-management-service-app@0.9.5) (2024-10-24)
 
 
diff --git a/packages/manager/apps/key-management-service/package.json b/packages/manager/apps/key-management-service/package.json
index 1ea8542277d4..2918e761cd6e 100644
--- a/packages/manager/apps/key-management-service/package.json
+++ b/packages/manager/apps/key-management-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ovh-ux/manager-key-management-service-app",
-  "version": "0.9.5",
+  "version": "0.10.0",
   "private": true,
   "description": "ovh key-management-service",
   "repository": {
@@ -53,9 +53,12 @@
     "@playwright/test": "^1.34.3",
     "@tanstack/react-query-devtools": "^5.51.21",
     "@testing-library/jest-dom": "^6.4.6",
-    "@testing-library/react": "^14.1.2",
+    "@testing-library/react": "^16.0.0",
+    "@testing-library/user-event": "^14.5.2",
     "@vitejs/plugin-react": "^4.2.1",
-    "typescript": "^4.3.2",
+    "element-internals-polyfill": "^1.3.11",
+    "msw": "2.1.7",
+    "typescript": "^5.1.6",
     "vite": "^5.2.13",
     "vitest": "^1.2.0"
   },
diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_en_GB.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_en_GB.json
index f81884cff988..404db8435e93 100644
--- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_en_GB.json
+++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_en_GB.json
@@ -32,8 +32,8 @@
   "key_management_service_service-keys_dashboard_field_operations_decrypt": "Decrypt",
   "key_management_service_service-keys_dashboard_field_operations_sign": "Signature",
   "key_management_service_service-keys_dashboard_field_operations_verify": "Verification",
-  "key_management_service_service-keys_dashboard_field_operations_wrapKey": "Encapsulation",
-  "key_management_service_service-keys_dashboard_field_operations_unwrapKey": "Decapsulation",
+  "key_management_service_service-keys_dashboard_field_operations_wrapKey": "Wrap",
+  "key_management_service_service-keys_dashboard_field_operations_unwrapKey": "Unwrap",
   "key_management_service_service-keys_update_name_title": "Rename",
   "key_management_service_service-keys_update_name_error_required": "The name must be between 1 and 32 characters long.",
   "key_management_service_service-keys_update_name_error_max": "The maximum number of characters has been exceeded. (32 characters maximum)",
@@ -52,7 +52,7 @@
   "key_management_service_service-keys_create_crypto_field_type_title": "Key type",
   "key_management_service_service-keys_create_crypto_field_type_subtitle": "Specify the type of algorithm used for the encryption key.",
   "key_management_service_service-keys_create_crypto_field_type_description_rsa": "Asymmetric key for signature and verification.",
-  "key_management_service_service-keys_create_crypto_field_type_description_oct": "Symmetric key for encryption/decryption and encapsulation.",
+  "key_management_service_service-keys_create_crypto_field_type_description_oct": "Symmetric key for encryption/decryption and wrapping.",
   "key_management_service_service-keys_create_crypto_field_type_description_ec": "Elliptical asymmetric key for signature and verification.",
   "key_management_service_service-keys_create_crypto_field_size_title": "Key size (algorithm)",
   "key_management_service_service-keys_create_crypto_field_size_subtitle": "Select the encryption key size.",
diff --git a/packages/manager/apps/key-management-service/src/components/Listing/ListingCells.tsx b/packages/manager/apps/key-management-service/src/components/Listing/ListingCells.tsx
index 30fbfa380778..8f6f41e26423 100644
--- a/packages/manager/apps/key-management-service/src/components/Listing/ListingCells.tsx
+++ b/packages/manager/apps/key-management-service/src/components/Listing/ListingCells.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import {
   ActionMenu,
-  DataGridClipboardCell,
+  Clipboard,
   DataGridTextCell,
   Links,
 } from '@ovh-ux/manager-react-components';
@@ -10,7 +10,7 @@ import {
   PageLocation,
   useOvhTracking,
 } from '@ovh-ux/manager-react-shell-client';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { ODS_ICON_NAME, ODS_SPINNER_SIZE } from '@ovhcloud/ods-components';
 import { OsdsSpinner } from '@ovhcloud/ods-components/react';
@@ -24,9 +24,10 @@ import { useOkmsServiceKeyById } from '@/data/hooks/useOkmsServiceKeys';
 import { useFormattedDate } from '@/hooks/useFormattedDate';
 import { useKMSServiceInfos } from '@/data/hooks/useKMSServiceInfos';
 import { OkmsServiceState } from '../layout-helpers/Dashboard/okmsServiceState/OkmsServiceState.component';
+import { OkmsContext } from '@/pages/dashboard';
 
 export const DatagridCellId = (props: OKMS | OkmsAllServiceKeys) => {
-  return <DataGridClipboardCell text={props.id} />;
+  return <Clipboard value={props.id} />;
 };
 
 export const DatagridCellName = (props: OKMS) => {
@@ -62,7 +63,7 @@ export const DatagridCellRegion = (props: OKMS) => {
 
 export const DatagridCellStatus = (props: OKMS) => {
   const { data: OkmsServiceInfos, isLoading, isError } = useKMSServiceInfos(
-    props,
+    props.id,
   );
   if (isLoading) {
     return <OsdsSpinner inline size={ODS_SPINNER_SIZE.sm} />;
@@ -97,7 +98,7 @@ export const DatagridServiceKeyCellName = (props: OkmsAllServiceKeys) => {
 };
 
 export const DatagridServiceKeyCellId = (props: OkmsAllServiceKeys) => {
-  return <DataGridClipboardCell text={props.id} />;
+  return <Clipboard value={props.id} />;
 };
 
 export const DatagridCellType = (props: OkmsAllServiceKeys) => {
@@ -129,12 +130,12 @@ export const DatagridStatus = (props: OkmsAllServiceKeys) => {
 };
 
 export const DatagridServiceKeyActionMenu = (props: OkmsAllServiceKeys) => {
-  const { okmsId } = useParams();
+  const okms = useContext(OkmsContext);
   const { data: serviceKey, isPending } = useOkmsServiceKeyById({
-    okmsId,
+    okmsId: okms.id,
     keyId: props.id,
   });
-  const actionList = useServiceKeyActionsList(okmsId, serviceKey?.data, true);
+  const actionList = useServiceKeyActionsList(okms, serviceKey?.data, true);
 
   if (isPending) {
     return <></>;
diff --git a/packages/manager/apps/key-management-service/src/components/Modal/EditNameModal.tsx b/packages/manager/apps/key-management-service/src/components/Modal/EditNameModal.tsx
deleted file mode 100644
index d3172e440f6a..000000000000
--- a/packages/manager/apps/key-management-service/src/components/Modal/EditNameModal.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import {
-  OsdsButton,
-  OsdsInput,
-  OsdsText,
-} from '@ovhcloud/ods-components/react';
-import {
-  ODS_INPUT_TYPE,
-  ODS_TEXT_LEVEL,
-  ODS_TEXT_SIZE,
-  OsdsInputCustomEvent,
-  OdsInputValueChangeEventDetail,
-  ODS_BUTTON_VARIANT,
-} from '@ovhcloud/ods-components';
-
-import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
-import React, { useState } from 'react';
-
-import { useTranslation } from 'react-i18next';
-import { isValidOkmsName } from '@/utils';
-import Modal from './Modal';
-import { OKMS } from '@/types/okms.type';
-
-interface DeleteModalProps {
-  okms: OKMS;
-  toggleModal: (showModal: boolean) => void;
-  onEditName: (okms: OKMS) => void;
-}
-
-const EditNameModal = ({ okms, toggleModal, onEditName }: DeleteModalProps) => {
-  const { t } = useTranslation('key-management-service/dashboard');
-  const [newName, setNewName] = useState(okms.iam?.displayName || '');
-  const isValidName = isValidOkmsName(newName);
-  const isButtonValid = okms.iam?.displayName !== newName && isValidName;
-
-  const onEdit = () => {
-    if (isButtonValid) {
-      onEditName({
-        ...okms,
-        iam: {
-          ...okms.iam,
-          displayName: newName,
-        },
-      } as OKMS);
-      toggleModal(false);
-    }
-  };
-  return (
-    <Modal
-      color={ODS_THEME_COLOR_INTENT.info}
-      onClose={() => toggleModal(false)}
-    >
-      <OsdsText
-        color={ODS_THEME_COLOR_INTENT.text}
-        level={ODS_TEXT_LEVEL.heading}
-        size={ODS_TEXT_SIZE._400}
-        className="my-4"
-      >
-        {t('key_management_service_dashboard_modal_title')}
-      </OsdsText>
-      <OsdsInput
-        aria-label="edit-input"
-        type={ODS_INPUT_TYPE.text}
-        color={
-          isValidName
-            ? ODS_THEME_COLOR_INTENT.info
-            : ODS_THEME_COLOR_INTENT.error
-        }
-        className="p-3"
-        value={newName}
-        onOdsValueChange={(
-          e: OsdsInputCustomEvent<OdsInputValueChangeEventDetail>,
-        ) => setNewName(e.target.value as string)}
-      />
-      <OsdsButton
-        slot="actions"
-        variant={ODS_BUTTON_VARIANT.stroked}
-        color={ODS_THEME_COLOR_INTENT.primary}
-        onClick={() => {
-          toggleModal(false);
-        }}
-      >
-        {t('key_management_service_dashboard_modal_cta_cancel')}
-      </OsdsButton>
-      <OsdsButton
-        disabled={!isButtonValid || undefined}
-        slot="actions"
-        color={ODS_THEME_COLOR_INTENT.primary}
-        onClick={onEdit}
-        aria-label="edit-name-okms"
-      >
-        {t('key_management_service_dashboard_modal_cta_edit')}
-      </OsdsButton>
-    </Modal>
-  );
-};
-
-export default EditNameModal;
diff --git a/packages/manager/apps/key-management-service/src/components/layout-helpers/Dashboard/GeneralInformationsTiles/InformationsTile.tsx b/packages/manager/apps/key-management-service/src/components/layout-helpers/Dashboard/GeneralInformationsTiles/InformationsTile.tsx
index 96bf74d1202a..820f75030242 100644
--- a/packages/manager/apps/key-management-service/src/components/layout-helpers/Dashboard/GeneralInformationsTiles/InformationsTile.tsx
+++ b/packages/manager/apps/key-management-service/src/components/layout-helpers/Dashboard/GeneralInformationsTiles/InformationsTile.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { OsdsButton, OsdsIcon, OsdsLink } from '@ovhcloud/ods-components/react';
 import { Clipboard } from '@ovh-ux/manager-react-components';
 import {
@@ -15,48 +15,41 @@ import {
 import { OdsHTMLAnchorElementTarget } from '@ovhcloud/ods-common-core';
 import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
 import { useTranslation } from 'react-i18next';
+import { Outlet, useNavigate } from 'react-router-dom';
 import { OKMS } from '@/types/okms.type';
-import EditNameModal from '@/components/Modal/EditNameModal';
-import { useUpdateOkmsName } from '@/data/hooks/useUpdateOkmsName';
 import { Tile } from '@/components/dashboard/tile/tile.component';
 import { TileSeparator } from '@/components/dashboard/tile-separator/tileSeparator';
 import { TileValue } from '@/components/dashboard/tile-value/tileValue.component';
 import { TileItem } from '@/components/dashboard/tile-item/tileItem.component';
+import { KMSServiceInfos } from '@/types/okmsService.type';
 
 type InformationTileProps = {
   okmsData?: OKMS;
+  okmsServiceInfos?: KMSServiceInfos;
 };
 
-const InformationsTile = ({ okmsData }: InformationTileProps) => {
+const InformationsTile = ({
+  okmsData,
+  okmsServiceInfos,
+}: InformationTileProps) => {
   const { t } = useTranslation('key-management-service/dashboard');
   const { trackClick } = useOvhTracking();
-  const [editModalDisplayed, setEditModalDisplayed] = useState(false);
-  const { updateKmsName } = useUpdateOkmsName({});
+  const navigate = useNavigate();
 
   return (
     <Tile title={t('general_informations')}>
-      {editModalDisplayed && (
-        <EditNameModal
-          okms={okmsData}
-          toggleModal={setEditModalDisplayed}
-          onEditName={(okms: OKMS) =>
-            updateKmsName({ okms: okms.id, displayName: okms.iam.displayName })
-          }
-        />
-      )}
       <TileSeparator />
       <TileItem title={t('key_management_service_dashboard_field_label_name')}>
         <div className="flex justify-between items-center">
-          <TileValue value={okmsData?.iam.displayName} />
+          <TileValue value={okmsServiceInfos?.resource.displayName} />
           <OsdsButton
             circle
             variant={ODS_BUTTON_VARIANT.stroked}
             color={ODS_THEME_COLOR_INTENT.primary}
-            onClick={() => setEditModalDisplayed(true)}
+            onClick={() => navigate('update-name')}
           >
             <OsdsIcon
               aria-label="edit"
-              onClick={() => setEditModalDisplayed(true)}
               name={ODS_ICON_NAME.PEN}
               size={ODS_ICON_SIZE.xs}
               color={ODS_THEME_COLOR_INTENT.primary}
@@ -113,6 +106,7 @@ const InformationsTile = ({ okmsData }: InformationTileProps) => {
           {okmsData?.swaggerEndpoint}
         </OsdsLink>
       </TileItem>
+      <Outlet />
     </Tile>
   );
 };
diff --git a/packages/manager/apps/key-management-service/src/components/serviceKey/modals/ServiceKeyDeactivateModal.component.tsx b/packages/manager/apps/key-management-service/src/components/serviceKey/modals/ServiceKeyDeactivateModal.component.tsx
index 5f82a23d1bc9..72326d854947 100644
--- a/packages/manager/apps/key-management-service/src/components/serviceKey/modals/ServiceKeyDeactivateModal.component.tsx
+++ b/packages/manager/apps/key-management-service/src/components/serviceKey/modals/ServiceKeyDeactivateModal.component.tsx
@@ -38,7 +38,7 @@ export const ServiceKeyDeactivateModal = ({
   const [deactivationReason, setDeactivationReason] = useState<
     OkmsServiceKeyDeactivationReason
   >();
-  const { addSuccess } = useNotifications();
+  const { addSuccess, clearNotifications } = useNotifications();
   const { t } = useTranslation('key-management-service/serviceKeys');
   const { t: tCommon } = useTranslation('key-management-service/common');
 
@@ -50,6 +50,7 @@ export const ServiceKeyDeactivateModal = ({
     okmsId,
     keyId,
     onSuccess: () => {
+      clearNotifications();
       addSuccess(
         t('key_management_service_service-keys_deactivation_success'),
         true,
diff --git a/packages/manager/apps/key-management-service/src/components/serviceKey/modals/ServiceKeyEditNameModal.component.tsx b/packages/manager/apps/key-management-service/src/components/serviceKey/modals/ServiceKeyEditNameModal.component.tsx
index a09d93f4f0a4..7b259e3df195 100644
--- a/packages/manager/apps/key-management-service/src/components/serviceKey/modals/ServiceKeyEditNameModal.component.tsx
+++ b/packages/manager/apps/key-management-service/src/components/serviceKey/modals/ServiceKeyEditNameModal.component.tsx
@@ -37,7 +37,7 @@ export const ServiceKeyEditNameModal = ({
 }: ServiceKeyEditNameModalProps) => {
   const [serviceKeyName, setServiceKeyName] = useState(name);
   const serviceKeyNameError = validateServiceKeyName(serviceKeyName);
-  const { addSuccess } = useNotifications();
+  const { addSuccess, clearNotifications } = useNotifications();
   const { t } = useTranslation('key-management-service/serviceKeys');
   const { t: tCommon } = useTranslation('key-management-service/common');
 
@@ -49,6 +49,7 @@ export const ServiceKeyEditNameModal = ({
     okmsId,
     keyId,
     onSuccess: () => {
+      clearNotifications();
       addSuccess(
         t('key_management_service_service-keys_update_name_success'),
         true,
diff --git a/packages/manager/apps/key-management-service/src/components/serviceKey/serviceKeyStateActions/ServiceKeyStateActions.component.tsx b/packages/manager/apps/key-management-service/src/components/serviceKey/serviceKeyStateActions/ServiceKeyStateActions.component.tsx
index f12ca98cb561..8fd659428096 100644
--- a/packages/manager/apps/key-management-service/src/components/serviceKey/serviceKeyStateActions/ServiceKeyStateActions.component.tsx
+++ b/packages/manager/apps/key-management-service/src/components/serviceKey/serviceKeyStateActions/ServiceKeyStateActions.component.tsx
@@ -1,5 +1,6 @@
-import { OsdsIcon, OsdsButton } from '@ovhcloud/ods-components/react';
 import React from 'react';
+import { OsdsIcon, OsdsButton } from '@ovhcloud/ods-components/react';
+import { ManagerButton } from '@ovh-ux/manager-react-components';
 import {
   ODS_BUTTON_SIZE,
   ODS_BUTTON_TEXT_ALIGN,
@@ -9,9 +10,10 @@ import {
 } from '@ovhcloud/ods-components';
 import { OkmsAllServiceKeys } from '@/types/okmsServiceKey.type';
 import useServiceKeyActionsList from '@/hooks/serviceKey/useServiceKeyActionsList';
+import { OKMS } from '@/types/okms.type';
 
 type ServiceKeyStateActionsProps = {
-  okmsId: string;
+  okms: OKMS;
   okmsKey: OkmsAllServiceKeys;
 };
 
@@ -23,38 +25,62 @@ const ActionsIcons = [
 ];
 
 const ServiceKeyStateActions = ({
-  okmsId,
+  okms,
   okmsKey,
 }: ServiceKeyStateActionsProps) => {
-  const actionList = useServiceKeyActionsList(okmsId, okmsKey);
+  const actionList = useServiceKeyActionsList(okms, okmsKey);
 
   const getActionIcon = (id: number) => {
     return ActionsIcons.find((actionIcon) => actionIcon.id === id)?.icon;
   };
   return (
     <>
-      {actionList.map((action) => (
-        <OsdsButton
-          key={action.id}
-          color={action.color}
-          variant={ODS_BUTTON_VARIANT.ghost}
-          size={ODS_BUTTON_SIZE.sm}
-          textAlign={ODS_BUTTON_TEXT_ALIGN.start}
-          onClick={action.onClick}
-          disabled={action.disabled || undefined}
-          href={action.href}
-          download={action.download}
-        >
-          <span slot="start">{action.label}</span>
-          <span slot="end">
-            <OsdsIcon
-              name={getActionIcon(action.id)}
-              size={ODS_ICON_SIZE.xxs}
-              color={action.color}
-            />
-          </span>
-        </OsdsButton>
-      ))}
+      {actionList.map((action) => {
+        return action.iamActions ? (
+          <ManagerButton
+            key={action.id}
+            color={action.color}
+            variant={ODS_BUTTON_VARIANT.ghost}
+            size={ODS_BUTTON_SIZE.sm}
+            textAlign={ODS_BUTTON_TEXT_ALIGN.start}
+            onClick={action.onClick}
+            disabled={action.disabled || undefined}
+            href={action.href}
+            download={action.download}
+            urn={action.urn}
+            iamActions={action.iamActions}
+          >
+            <span slot="start">{action.label}</span>
+            <span slot="end">
+              <OsdsIcon
+                name={getActionIcon(action.id)}
+                size={ODS_ICON_SIZE.xxs}
+                color={action.color}
+              />
+            </span>
+          </ManagerButton>
+        ) : (
+          <OsdsButton
+            key={action.id}
+            variant={ODS_BUTTON_VARIANT.ghost}
+            size={ODS_BUTTON_SIZE.sm}
+            color={action.color}
+            href={action.href}
+            download={action.download}
+            disabled={action.disabled || undefined}
+            onClick={action.onClick}
+          >
+            <span slot="start">{action.label}</span>
+            <span slot="end">
+              <OsdsIcon
+                name={getActionIcon(action.id)}
+                size={ODS_ICON_SIZE.xxs}
+                color={action.color}
+              />
+            </span>
+          </OsdsButton>
+        );
+      })}
     </>
   );
 };
diff --git a/packages/manager/apps/key-management-service/src/data/api/okms.ts b/packages/manager/apps/key-management-service/src/data/api/okms.ts
index caa5e0f830f9..f5f9865186f8 100644
--- a/packages/manager/apps/key-management-service/src/data/api/okms.ts
+++ b/packages/manager/apps/key-management-service/src/data/api/okms.ts
@@ -92,20 +92,6 @@ export const getListingIcebergV2 = async ({
   }
 };
 
-/**
- *  Get okms listing with iceberg V2
- */
-export const getListingIceberg = async () => {
-  try {
-    const List = await fetchIcebergV2({
-      route: '/okms/resource',
-    });
-    return List.data as OKMS[];
-  } catch (error) {
-    return null;
-  }
-};
-
 export const getOkmsResourceQueryKey = (okmsId: string) => [
   `get/okms/resource/${okmsId}`,
 ];
diff --git a/packages/manager/apps/key-management-service/src/data/api/okmsService.ts b/packages/manager/apps/key-management-service/src/data/api/okmsService.ts
index 8f60cff29731..de066437a23e 100644
--- a/packages/manager/apps/key-management-service/src/data/api/okmsService.ts
+++ b/packages/manager/apps/key-management-service/src/data/api/okmsService.ts
@@ -16,24 +16,20 @@ export const updateOkmsName = async ({
     displayName,
   });
 
-export type GetOkmsServiceIdParams = {
-  /** Filter on a specific service family */
-  okms: string;
-};
-
-export const getOkmsServiceIdQueryKey = ({
-  okms = '',
-}: GetOkmsServiceIdParams) => [`get/services${okms}`];
+export const getOkmsServiceIdQueryKey = (okmsId: string) => [
+  `get/okms/services`,
+  okmsId,
+];
 /**
  * allowedServices operations : List all services allowed in this kms
  */
-export const getOkmsServiceId = async ({ okms }: GetOkmsServiceIdParams) => {
-  const resourceName = okms ? `?resourceName=${okms}` : '';
+export const getOkmsServiceId = async (okmsId: string) => {
+  const resourceName = okmsId ? `?resourceName=${okmsId}` : '';
   return apiClient.v6.get<number[]>(`/services${resourceName}`);
 };
 
-export const getServiceInfos = async ({ okms }: GetOkmsServiceIdParams) => {
-  const serviceId = await getOkmsServiceId({ okms });
+export const getServiceInfos = async (okmsId: string) => {
+  const serviceId = await getOkmsServiceId(okmsId);
   return apiClient.v6.get<KMSServiceInfos>(`/services/${serviceId.data[0]}`);
 };
 
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useCreateOkmsCredential.ts b/packages/manager/apps/key-management-service/src/data/hooks/useCreateOkmsCredential.ts
index 42061cf963ab..db078b5a7e0c 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useCreateOkmsCredential.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useCreateOkmsCredential.ts
@@ -21,7 +21,7 @@ export const useCreateOkmsCredential = ({
   onError,
 }: CreateOkmsCredentialParams) => {
   const queryClient = useQueryClient();
-  const { addError, addSuccess } = useNotifications();
+  const { addError, addSuccess, clearNotifications } = useNotifications();
 
   const { t } = useTranslation('key-management-service/credential');
 
@@ -34,10 +34,12 @@ export const useCreateOkmsCredential = ({
       await queryClient.invalidateQueries({
         queryKey: getOkmsCredentialsQueryKey(okmsId),
       });
+      clearNotifications();
       addSuccess(t('key_management_service_credential_create_success'), true);
       onSuccess?.(credential);
     },
     onError: (result: ApiError) => {
+      clearNotifications();
       addError(
         t('key_management_service_credential_create_error', {
           error: result.message,
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useCreateOkmsServiceKey.ts b/packages/manager/apps/key-management-service/src/data/hooks/useCreateOkmsServiceKey.ts
index 5240c813572b..302f2c2e1193 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useCreateOkmsServiceKey.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useCreateOkmsServiceKey.ts
@@ -20,7 +20,7 @@ export const useCreateOkmsServiceKey = ({
   onError,
 }: CreateOkmsServiceKeyParams) => {
   const queryClient = useQueryClient();
-  const { addError, addSuccess } = useNotifications();
+  const { addError, addSuccess, clearNotifications } = useNotifications();
 
   const { t } = useTranslation('key-management-service/serviceKeys');
 
@@ -32,10 +32,12 @@ export const useCreateOkmsServiceKey = ({
       await queryClient.invalidateQueries({
         queryKey: getOkmsServiceKeyResourceListQueryKey(okmsId),
       });
+      clearNotifications();
       addSuccess(t('key_management_service_service-keys_create_success'), true);
       onSuccess?.();
     },
     onError: (result: ApiError) => {
+      clearNotifications();
       addError(
         t('key_management_service_service-keys_create_error', {
           error: result.message,
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useDeleteOkmsCredential.ts b/packages/manager/apps/key-management-service/src/data/hooks/useDeleteOkmsCredential.ts
index 81d86113ea6e..8c78bc28a4c8 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useDeleteOkmsCredential.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useDeleteOkmsCredential.ts
@@ -22,7 +22,7 @@ export const useDeleteOkmsCredential = ({
   onError,
 }: IUseDeleteOkmsCredential) => {
   const queryClient = useQueryClient();
-  const { addError, addSuccess } = useNotifications();
+  const { addError, addSuccess, clearNotifications } = useNotifications();
   const { t } = useTranslation('key-management-service/credential');
 
   const { mutate, isPending } = useMutation({
@@ -34,11 +34,12 @@ export const useDeleteOkmsCredential = ({
       await queryClient.invalidateQueries({
         queryKey: getOkmsCredentialsQueryKey(okmsId),
       });
-
+      clearNotifications();
       addSuccess(t('key_management_service_credential_delete_success'), true);
       onSuccess();
     },
     onError: (result: ApiError) => {
+      clearNotifications();
       addError(
         t('key_management_service_credential_delete_error', {
           error: result.message,
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useDeleteOkmsServiceKey.ts b/packages/manager/apps/key-management-service/src/data/hooks/useDeleteOkmsServiceKey.ts
index fb4aa0b96f45..d65425fec7c1 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useDeleteOkmsServiceKey.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useDeleteOkmsServiceKey.ts
@@ -23,7 +23,7 @@ export const useDeleteOkmsServiceKey = ({
   onError,
 }: DeleteOkmsServiceKeyParams) => {
   const queryClient = useQueryClient();
-  const { addError, addSuccess } = useNotifications();
+  const { addError, addSuccess, clearNotifications } = useNotifications();
 
   const { t } = useTranslation('key-management-service/serviceKeys');
 
@@ -39,10 +39,12 @@ export const useDeleteOkmsServiceKey = ({
       await queryClient.invalidateQueries({
         queryKey: getOkmsServiceKeyResourceQueryKey({ okmsId, keyId }),
       });
+      clearNotifications();
       addSuccess(t('key_management_service_service-keys_delete_success'), true);
       onSuccess();
     },
     onError: (result: ApiError) => {
+      clearNotifications();
       addError(
         t('key_management_service_service-keys_delete_error', {
           error: result.message,
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useKMSServiceInfos.ts b/packages/manager/apps/key-management-service/src/data/hooks/useKMSServiceInfos.ts
index acc26a7515bf..c637da680dd6 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useKMSServiceInfos.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useKMSServiceInfos.ts
@@ -1,16 +1,16 @@
 import { useQuery } from '@tanstack/react-query';
-import { OKMS } from '@/types/okms.type';
 import { ErrorResponse } from '@/types/api.type';
 import { KMSServiceInfos } from '@/types/okmsService.type';
 import { getServiceInfos } from '../api/okmsService';
 
-export const useKMSServiceInfos = (okms?: OKMS) => {
+export const getKMSServiceInfosQueryKey = (okmsId: string) => [
+  'okms/service/infos',
+  okmsId,
+];
+export const useKMSServiceInfos = (okmId?: string) => {
   return useQuery<{ data: KMSServiceInfos }, ErrorResponse>({
-    queryKey: ['okms/service/infos', okms?.id],
-    queryFn: () => getServiceInfos({ okms: okms?.id }),
+    queryKey: getKMSServiceInfosQueryKey(okmId),
+    queryFn: () => getServiceInfos(okmId),
     retry: false,
-    ...{
-      keepPreviousData: true,
-    },
   });
 };
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useOKMS.ts b/packages/manager/apps/key-management-service/src/data/hooks/useOKMS.ts
index 2a326e9bf6de..6e254e0ed428 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useOKMS.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useOKMS.ts
@@ -1,13 +1,12 @@
 import { useQuery } from '@tanstack/react-query';
 import apiClient from '@ovh-ux/manager-core-api';
+import { useResourcesIcebergV2 } from '@ovh-ux/manager-react-components';
 
-import { OKMS, OKMSOptions } from '@/types/okms.type';
+import { OKMS } from '@/types/okms.type';
 import { ErrorResponse } from '@/types/api.type';
 import {
-  getListingIceberg,
   getOkmsResourceQueryKey,
   getOkmsServicesResourceListQueryKey,
-  sortOKMS,
 } from '../api/okms';
 
 export const getOKMSResource = async (
@@ -16,18 +15,6 @@ export const getOKMSResource = async (
   return apiClient.v2.get(`okms/resource/${okmsId}`);
 };
 
-export const useAllOKMS = () => {
-  return useQuery({
-    queryKey: getOkmsServicesResourceListQueryKey,
-    queryFn: () => getListingIceberg(),
-    retry: false,
-    ...{
-      keepPreviousData: true,
-    },
-    refetchInterval: 5000,
-  });
-};
-
 export const useOKMSById = (okmsId: string) => {
   return useQuery<{ data: OKMS }, ErrorResponse>({
     queryKey: getOkmsResourceQueryKey(okmsId),
@@ -36,21 +23,12 @@ export const useOKMSById = (okmsId: string) => {
     ...{
       keepPreviousData: true,
     },
-    refetchInterval: 5000,
   });
 };
 
-export const useOKMS = ({ sorting }: OKMSOptions) => {
-  // retrieve All OKMS from API
-  const {
-    data: okms,
-    error: allOKMSError,
-    isLoading: allOKMSLoading,
-  } = useAllOKMS();
-
-  return {
-    isLoading: allOKMSLoading,
-    error: allOKMSError,
-    data: sortOKMS(okms || [], sorting),
-  };
-};
+export const useOKMSList = ({ pageSize }: { pageSize?: number }) =>
+  useResourcesIcebergV2<OKMS>({
+    route: '/okms/resource',
+    queryKey: getOkmsServicesResourceListQueryKey,
+    pageSize,
+  });
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useOkmsServiceKeys.ts b/packages/manager/apps/key-management-service/src/data/hooks/useOkmsServiceKeys.ts
index b4f06145fce3..814af9dba6fd 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useOkmsServiceKeys.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useOkmsServiceKeys.ts
@@ -1,5 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 
+import { ApiError } from '@ovh-ux/manager-core-api';
 import { ErrorResponse } from '@/types/api.type';
 import {
   getOkmsServiceKeyResource,
@@ -16,7 +17,7 @@ import {
 /* Service Key List */
 
 export const useAllOkmsServiceKeys = (okmsId: string) => {
-  return useQuery({
+  return useQuery<{ data: OkmsAllServiceKeys[] }, ApiError>({
     queryKey: getOkmsServiceKeyResourceListQueryKey(okmsId),
     queryFn: () => getListingOkmsServiceKey(okmsId),
     retry: false,
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useTerminateOKms.ts b/packages/manager/apps/key-management-service/src/data/hooks/useTerminateOKms.ts
index d45109ddbc96..a862377f09d9 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useTerminateOKms.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useTerminateOKms.ts
@@ -29,8 +29,8 @@ export const useTerminateOKms = ({
       const { data: servicesId } = await queryClient.fetchQuery<
         ApiResponse<number[]>
       >({
-        queryKey: getOkmsServiceIdQueryKey({ okms: okmsId }),
-        queryFn: () => getOkmsServiceId({ okms: okmsId }),
+        queryKey: getOkmsServiceIdQueryKey(okmsId),
+        queryFn: () => getOkmsServiceId(okmsId),
       });
       return terminateOKms({ serviceId: servicesId[0] });
     },
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useUpdateOkmsName.ts b/packages/manager/apps/key-management-service/src/data/hooks/useUpdateOkmsName.ts
index e153e4996f2c..8a7471075431 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useUpdateOkmsName.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useUpdateOkmsName.ts
@@ -1,14 +1,24 @@
 import { ApiError, ApiResponse } from '@ovh-ux/manager-core-api';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import React from 'react';
-import { getOkmsServicesResourceListQueryKey } from '../api/okms';
+import { useTranslation } from 'react-i18next';
+import { useNotifications } from '@ovh-ux/manager-react-components';
+import {
+  getOkmsResourceQueryKey,
+  getOkmsServicesResourceListQueryKey,
+} from '../api/okms';
 import {
   updateOkmsNameQueryKey,
   getOkmsServiceIdQueryKey,
   getOkmsServiceId,
   updateOkmsName,
 } from '../api/okmsService';
+import { getKMSServiceInfosQueryKey } from './useKMSServiceInfos';
 
+export type UpdateOkmsParams = {
+  okmsId: string;
+  onSuccess: () => void;
+  onError?: (result: ApiError) => void;
+};
 export type UpdateOkmsNameMutationParams = {
   /** Okms service id */
   okms: string;
@@ -20,14 +30,13 @@ export type UpdateOkmsNameMutationParams = {
  * Get the function to mutate a okms Services
  */
 export const useUpdateOkmsName = ({
+  okmsId,
   onSuccess,
   onError,
-}: {
-  onSuccess?: () => void;
-  onError?: (result: ApiError) => void;
-}) => {
-  const [isErrorVisible, setIsErrorVisible] = React.useState(false);
+}: UpdateOkmsParams) => {
   const queryClient = useQueryClient();
+  const { t } = useTranslation('key-management-service/serviceKeys');
+  const { addError, addSuccess, clearNotifications } = useNotifications();
 
   const {
     mutate: updateKmsName,
@@ -39,19 +48,36 @@ export const useUpdateOkmsName = ({
       const { data: servicesId } = await queryClient.fetchQuery<
         ApiResponse<number[]>
       >({
-        queryKey: getOkmsServiceIdQueryKey({ okms }),
-        queryFn: () => getOkmsServiceId({ okms }),
+        queryKey: getOkmsServiceIdQueryKey(okms),
+        queryFn: () => getOkmsServiceId(okms),
       });
       return updateOkmsName({ serviceId: servicesId[0], displayName });
     },
-    onSuccess: () => {
-      queryClient.invalidateQueries({
+    onSuccess: async () => {
+      await queryClient.invalidateQueries({
         queryKey: getOkmsServicesResourceListQueryKey,
       });
+      await queryClient.invalidateQueries({
+        queryKey: getKMSServiceInfosQueryKey(okmsId),
+      });
+      await queryClient.invalidateQueries({
+        queryKey: getOkmsResourceQueryKey(okmsId),
+      });
+      clearNotifications();
+      addSuccess(
+        t('key_management_service_service-keys_update_name_success'),
+        true,
+      );
       onSuccess?.();
     },
     onError: (result: ApiError) => {
-      setIsErrorVisible(true);
+      clearNotifications();
+      addError(
+        t('key_management_service_service-keys_update_error', {
+          error: result.message,
+        }),
+        true,
+      );
       onError?.(result);
     },
   });
@@ -59,8 +85,6 @@ export const useUpdateOkmsName = ({
   return {
     updateKmsName,
     isPending,
-    isErrorVisible: updateNameError && isErrorVisible,
     error: updateNameError,
-    hideError: () => setIsErrorVisible(false),
   };
 };
diff --git a/packages/manager/apps/key-management-service/src/data/hooks/useUpdateOkmsServiceKey.ts b/packages/manager/apps/key-management-service/src/data/hooks/useUpdateOkmsServiceKey.ts
index 58b220130222..a4df369e1ec4 100644
--- a/packages/manager/apps/key-management-service/src/data/hooks/useUpdateOkmsServiceKey.ts
+++ b/packages/manager/apps/key-management-service/src/data/hooks/useUpdateOkmsServiceKey.ts
@@ -24,7 +24,7 @@ export const useUpdateOkmsServiceKey = ({
   onError,
 }: UpdateOkmsServiceKeyParams) => {
   const queryClient = useQueryClient();
-  const { addError } = useNotifications();
+  const { addError, clearNotifications } = useNotifications();
 
   const { t } = useTranslation('key-management-service/serviceKeys');
 
@@ -43,6 +43,7 @@ export const useUpdateOkmsServiceKey = ({
       onSuccess();
     },
     onError: (result: ApiError) => {
+      clearNotifications();
       addError(
         t('key_management_service_service-keys_update_error', {
           error: result.message,
diff --git a/packages/manager/apps/key-management-service/src/hooks/guide/guidesLinks.constant.ts b/packages/manager/apps/key-management-service/src/hooks/guide/guidesLinks.constant.ts
index e9fe16e93a25..4cded76f56d1 100644
--- a/packages/manager/apps/key-management-service/src/hooks/guide/guidesLinks.constant.ts
+++ b/packages/manager/apps/key-management-service/src/hooks/guide/guidesLinks.constant.ts
@@ -2,6 +2,11 @@ import { CountryCode } from '@ovh-ux/manager-config';
 
 type GuideLinks = { [key in CountryCode]: string };
 
+export const SUPPORT_URL: Record<string, string> = {
+  EU: 'https://help.ovhcloud.com',
+  US: 'https://support.us.ovhcloud.com',
+};
+
 export const GUIDE_LIST: {
   [guideName: string]: Partial<GuideLinks>;
 } = {
@@ -27,7 +32,8 @@ export const GUIDE_LIST: {
       '/csm/fr-ca-kms-quick-start?id=kb_article_view&sysparm_article=KB0063373',
     SG:
       '/csm/en-sg-kms-quick-start?id=kb_article_view&sysparm_article=KB006337',
-    US: '/csm/en-kms-quick-start?id=kb_article_view&sysparm_article=KB0063366',
+    US:
+      '/hc/en-us/articles/31481250033811-Getting-Started-with-OVHcloud-Key-Management-Service-KMS',
     WE: '/csm/en-kms-quick-start?id=kb_article_view&sysparm_article=KB0063366',
     WS:
       '/csm/es-es-kms-quick-start?id=kb_article_view&sysparm_article=KB0063370',
diff --git a/packages/manager/apps/key-management-service/src/hooks/guide/useGuideUtils.tsx b/packages/manager/apps/key-management-service/src/hooks/guide/useGuideUtils.tsx
index 54e86d1d200c..445a1c07b82a 100644
--- a/packages/manager/apps/key-management-service/src/hooks/guide/useGuideUtils.tsx
+++ b/packages/manager/apps/key-management-service/src/hooks/guide/useGuideUtils.tsx
@@ -1,9 +1,7 @@
 import { useContext, useEffect, useState } from 'react';
 import { CountryCode } from '@ovh-ux/manager-config';
 import { ShellContext } from '@ovh-ux/manager-react-shell-client';
-import { GUIDE_LIST } from './guidesLinks.constant';
-
-const helpCenterUrl = 'https://help.ovhcloud.com';
+import { GUIDE_LIST, SUPPORT_URL } from './guidesLinks.constant';
 
 type GetGuideLinkProps = {
   name?: string;
@@ -17,7 +15,8 @@ function getGuideListLink({ subsidiary }: GetGuideLinkProps) {
     const guide =
       GUIDE_LIST[key[0]][subsidiary as CountryCode] || GUIDE_LIST[key[0]].GB;
 
-    list[key[0]] = helpCenterUrl + guide;
+    const helpCenterUrl = SUPPORT_URL[subsidiary] ?? SUPPORT_URL.EU;
+    list[key[0]] = `${helpCenterUrl}${guide}`;
   });
   return list;
 }
diff --git a/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActions.spec.tsx b/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActions.spec.tsx
index 2664b2ab4b64..ad674f1fcf08 100644
--- a/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActions.spec.tsx
+++ b/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActions.spec.tsx
@@ -1,8 +1,13 @@
 import { describe, expect, it, vi } from 'vitest';
 import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
 import { renderHook } from '@testing-library/react';
-import { OkmsKeyTypes, OkmsServiceKeyState } from '@/types/okmsServiceKey.type';
+import {
+  OkmsAllServiceKeys,
+  OkmsKeyTypes,
+  OkmsServiceKeyState,
+} from '@/types/okmsServiceKey.type';
 import useServiceKeyActionsList from './useServiceKeyActionsList';
+import { OKMS } from '@/types/okms.type';
 
 vi.mock('react-i18next', () => ({
   useTranslation: vi.fn(() => ({ t: vi.fn((key) => key) })),
@@ -31,13 +36,25 @@ vi.mock('@/data/hooks/useUpdateOkmsServiceKey', () => ({
 }));
 
 describe('useServiceKeyActionsList', () => {
-  const okmsId = 'testOkmsId';
-  const commonKeyProps = {
+  const okms: OKMS = {
+    iam: {
+      displayName: 'kms-1',
+      id: '1b4e7c8e-d1b8-4b46-a584-52c8b4b0225c',
+      urn: `urn:v1:eu:resource:okms:1b4e7c8e-d1b8-4b46-a584-52c8b4b0225c`,
+    },
+    id: '7f3a82ac-a8d8-4c2a-ab0c-f6e86ddf6a7c',
+    kmipEndpoint: 'eu-west-rbx.okms.ovh.net:1234',
+    region: 'EU_WEST_RBX',
+    restEndpoint: 'https://eu-west-rbx.okms.ovh.net',
+    swaggerEndpoint: '"https://swagger-eu-west-rbx.okms.ovh.net',
+  };
+
+  const commonKeyProps: Omit<OkmsAllServiceKeys, 'type' | 'state'> = {
     id: 'testKeyId',
     name: 'testKeyName',
-    keys: [] as any[],
+    keys: [],
     createdAt: '2023-01-01T00:00:00Z',
-    operations: [] as any[],
+    operations: [],
   };
 
   const useCases = [
@@ -171,7 +188,7 @@ describe('useServiceKeyActionsList', () => {
   useCases.forEach(({ description, okmsKey, expectedActions }) => {
     it(description, () => {
       const { result } = renderHook(() =>
-        useServiceKeyActionsList(okmsId, okmsKey),
+        useServiceKeyActionsList(okms, okmsKey),
       );
       expect(result.current).toEqual(
         expect.arrayContaining(
diff --git a/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActionsList.tsx b/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActionsList.tsx
index 2f696ab258ee..818f8c4de944 100644
--- a/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActionsList.tsx
+++ b/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyActionsList.tsx
@@ -13,23 +13,24 @@ import {
   OkmsKeyTypes,
   OkmsServiceKeyState,
 } from '@/types/okmsServiceKey.type';
+import { OKMS } from '@/types/okms.type';
 
 const useServiceKeyActionsList = (
-  okmsId: string,
+  okms: OKMS,
   okmsKey?: OkmsAllServiceKeys,
   isListMode?: boolean,
 ) => {
   const { t } = useTranslation('key-management-service/serviceKeys');
-  const { addSuccess } = useNotifications();
+  const { addSuccess, clearNotifications } = useNotifications();
   const navigate = useNavigate();
   const {
     deleteKmsServiceKey,
     isPending: deleteIsPending,
   } = useDeleteOkmsServiceKey({
-    okmsId,
+    okmsId: okms.id,
     keyId: okmsKey?.id,
     onSuccess: () => {
-      navigate(`/${okmsId}/${ROUTES_URLS.keys}`);
+      navigate(`/${okms.id}/${ROUTES_URLS.keys}`);
     },
     onError: () => {},
   });
@@ -38,9 +39,10 @@ const useServiceKeyActionsList = (
     updateKmsServiceKey,
     isPending: updateIsPending,
   } = useUpdateOkmsServiceKey({
-    okmsId,
+    okmsId: okms.id,
     keyId: okmsKey?.id,
     onSuccess: () => {
+      clearNotifications();
       addSuccess(
         t('key_management_service_service-keys_reactivate_success'),
         true,
@@ -72,9 +74,11 @@ const useServiceKeyActionsList = (
         return isListMode
           ? navigate(`${ROUTES_URLS.serviceKeyDeactivate}/${okmsKey?.id}`)
           : navigate(
-              `/${okmsId}/${ROUTES_URLS.keys}/${okmsKey?.id}/${ROUTES_URLS.serviceKeyDeactivate}`,
+              `/${okms.id}/${ROUTES_URLS.keys}/${okmsKey?.id}/${ROUTES_URLS.serviceKeyDeactivate}`,
             );
       },
+      iamActions: ['okms:apiovh:resource/serviceKey/deactivate'],
+      urn: okms.iam.urn,
     });
   }
   if (
@@ -87,6 +91,8 @@ const useServiceKeyActionsList = (
       color: ODS_THEME_COLOR_INTENT.primary,
       disabled: updateIsPending,
       onClick: () => updateKmsServiceKey({ state: OkmsServiceKeyState.active }),
+      iamActions: ['okms:apiovh:resource/serviceKey/activate'],
+      urn: okms.iam.urn,
     });
   }
   if (
@@ -100,6 +106,8 @@ const useServiceKeyActionsList = (
       disabled:
         okmsKey?.state === OkmsServiceKeyState.active || deleteIsPending,
       onClick: () => deleteKmsServiceKey(),
+      iamActions: ['okms:apiovh:resource/serviceKey/delete'],
+      urn: okms.iam.urn,
     });
   }
   return items;
diff --git a/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyOperationsTranslations.spec.tsx b/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyOperationsTranslations.spec.tsx
index c5a30fe9462c..13b98ec1e7d9 100644
--- a/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyOperationsTranslations.spec.tsx
+++ b/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyOperationsTranslations.spec.tsx
@@ -1,7 +1,16 @@
-import { describe, expect, it, test } from 'vitest';
+import { describe, expect, it, test, vi } from 'vitest';
 import { OkmsServiceKeyOperations } from '@/types/okmsServiceKey.type';
 import { useServiceKeyOperationsTranslations } from './useServiceKeyOperationsTranslations';
 
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (translationKey: string) => translationKey,
+    i18n: {
+      changeLanguage: () => new Promise(() => {}),
+    },
+  }),
+}));
+
 describe('get service key operations translation ', () => {
   const useCases: {
     operation: OkmsServiceKeyOperations;
diff --git a/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyTypeTranslations.spec.tsx b/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyTypeTranslations.spec.tsx
index 1c08795cd6b4..a916f9533012 100644
--- a/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyTypeTranslations.spec.tsx
+++ b/packages/manager/apps/key-management-service/src/hooks/serviceKey/useServiceKeyTypeTranslations.spec.tsx
@@ -1,7 +1,16 @@
-import { describe, expect, it, test } from 'vitest';
+import { describe, expect, it, test, vi } from 'vitest';
 import { OkmsKeyTypes } from '@/types/okmsServiceKey.type';
 import { useServiceKeyTypeTranslations } from './useServiceKeyTypeTranslations';
 
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (translationKey: string) => translationKey,
+    i18n: {
+      changeLanguage: () => new Promise(() => {}),
+    },
+  }),
+}));
+
 describe('get service key type translation ', () => {
   const useCases: {
     type: OkmsKeyTypes;
diff --git a/packages/manager/apps/key-management-service/src/mocks/okms.mock.ts b/packages/manager/apps/key-management-service/src/mocks/okms.mock.ts
new file mode 100644
index 000000000000..c7a1103b4b51
--- /dev/null
+++ b/packages/manager/apps/key-management-service/src/mocks/okms.mock.ts
@@ -0,0 +1,42 @@
+import { PathParams } from 'msw';
+import { Handler } from '../../../../../../playwright-helpers';
+import { OKMS } from '@/types/okms.type';
+
+export const okmsList: OKMS[] = [
+  {
+    iam: {
+      displayName: 'kms-1',
+      id: '1b4e7c8e-d1b8-4b46-a584-52c8b4b0225c',
+      urn: `urn:v1:eu:resource:okms:1b4e7c8e-d1b8-4b46-a584-52c8b4b0225c`,
+    },
+    id: '7f3a82ac-a8d8-4c2a-ab0c-f6e86ddf6a7c',
+    kmipEndpoint: 'eu-west-rbx.okms.ovh.net:1234',
+    region: 'EU_WEST_RBX',
+    restEndpoint: 'https://eu-west-rbx.okms.ovh.net',
+    swaggerEndpoint: '"https://swagger-eu-west-rbx.okms.ovh.net',
+  },
+];
+
+export type GetOkmsMocksParams = {
+  nbOkms?: number;
+};
+
+const findOkmsById = (params: PathParams) =>
+  okmsList.find(({ id }) => id === params.id);
+
+export const getOkmsMocks = ({
+  nbOkms = okmsList.length,
+}: GetOkmsMocksParams): Handler[] => [
+  {
+    url: '/okms/resource/:id',
+    response: (_: unknown, params: PathParams) => findOkmsById(params),
+    status: 200,
+    api: 'v2',
+  },
+  {
+    url: '/okms/resource',
+    response: okmsList.slice(0, nbOkms),
+    status: 200,
+    api: 'v2',
+  },
+];
diff --git a/packages/manager/apps/key-management-service/src/mocks/services.mock.ts b/packages/manager/apps/key-management-service/src/mocks/services.mock.ts
new file mode 100644
index 000000000000..19fe0b3e8db6
--- /dev/null
+++ b/packages/manager/apps/key-management-service/src/mocks/services.mock.ts
@@ -0,0 +1,36 @@
+import { KMSServiceInfos, OkmsState } from '@/types/okmsService.type';
+import { Handler } from '../../../../../../playwright-helpers';
+
+const serviceList: KMSServiceInfos[] = [
+  {
+    billing: {
+      lifecycle: { current: { creationDate: '2024-04-12T18:00:00.000Z' } },
+      nextBillingDate: '2024-05-12T18:00:00.000Z',
+    },
+    customer: { contacts: [{ customerCode: 'code', type: 'type' }] },
+    resource: {
+      displayName: 'name',
+      name: 'name',
+      product: { name: 'name', description: 'descripton' },
+      resellingProvider: 'test',
+      state: OkmsState.Active,
+    },
+  },
+];
+
+export const getServicesMocks = (): Handler[] => [
+  {
+    url: '/services/:id',
+    response: serviceList[0],
+    status: 200,
+    method: 'get',
+    api: 'v6',
+  },
+  {
+    url: '/services',
+    response: () => [1234567890],
+    status: 200,
+    method: 'get',
+    api: 'v6',
+  },
+];
diff --git a/packages/manager/apps/key-management-service/src/pages/credential/create/CreateAddIdentities.component.tsx b/packages/manager/apps/key-management-service/src/pages/credential/create/CreateAddIdentities.component.tsx
index 820c776c97b0..4de995d7eb00 100644
--- a/packages/manager/apps/key-management-service/src/pages/credential/create/CreateAddIdentities.component.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/credential/create/CreateAddIdentities.component.tsx
@@ -83,9 +83,9 @@ const CreateAddIdentities = ({
                   )}
                 </OsdsText>
               </div>
-              <IdentitiesSelectedUsersList />
-              <IdentitiesSelectedGroups />
-              <IdentitiesSelectedServiceAccounts />
+              <IdentitiesSelectedUsersList identityURNs={identityURNs} />
+              <IdentitiesSelectedGroups identityURNs={identityURNs} />
+              <IdentitiesSelectedServiceAccounts identityURNs={identityURNs} />
             </>
           )}
         </div>
diff --git a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedBase.component.tsx b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedBase.component.tsx
index 762edddd6777..9b7041ca026d 100644
--- a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedBase.component.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedBase.component.tsx
@@ -11,6 +11,7 @@ import { useTranslation } from 'react-i18next';
 
 type IdentitiesSelectedBaseProps = {
   title: string;
+  identityURNs: string[];
   addCallback: () => void;
   addButtonLabel: string;
   deleteCallback: () => void;
@@ -20,6 +21,7 @@ type IdentitiesSelectedBaseProps = {
 
 const IdentitiesSelectedBase = ({
   title,
+  identityURNs,
   addCallback,
   addButtonLabel,
   deleteCallback,
@@ -36,6 +38,7 @@ const IdentitiesSelectedBase = ({
           variant={ODS_BUTTON_VARIANT.stroked}
           size={ODS_BUTTON_SIZE.sm}
           color={ODS_THEME_COLOR_INTENT.primary}
+          disabled={identityURNs.length > 25 || undefined}
           onClick={addCallback}
         >
           {addButtonLabel}
diff --git a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedGroups.component.tsx b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedGroups.component.tsx
index 0d6180275fae..a46f7054dce2 100644
--- a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedGroups.component.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedGroups.component.tsx
@@ -10,7 +10,13 @@ import IdentityGroupNameCell from './cell/group/IdentityGroupNameCell.component'
 import IdentityGroupDescriptionCell from './cell/group/IdentityGroupDescriptionCell.component';
 import IdentityGroupDeleteActionCell from './cell/group/IdentityGroupDeleteActionCell';
 
-const IdentitiesSelectedGroups = () => {
+type IdentitiesSelectedGroupsProps = {
+  identityURNs: string[];
+};
+
+const IdentitiesSelectedGroups = ({
+  identityURNs,
+}: IdentitiesSelectedGroupsProps) => {
   const { t } = useTranslation('key-management-service/credential');
   const navigate = useNavigate();
   const { groupList, setGroupList } = useIdentityData();
@@ -49,6 +55,7 @@ const IdentitiesSelectedGroups = () => {
       deleteCallback={() => setGroupList([])}
       datagridColumns={columns}
       items={groupList}
+      identityURNs={identityURNs}
     ></IdentitiesSelectedBase>
   );
 };
diff --git a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedServiceAccounts.component.tsx b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedServiceAccounts.component.tsx
index ace116814196..95f49d40c3f1 100644
--- a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedServiceAccounts.component.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedServiceAccounts.component.tsx
@@ -6,11 +6,17 @@ import { ROUTES_URLS } from '@/routes/routes.constants';
 import { useIdentityData } from '@/hooks/credential/useIdentityData';
 import { IdentityOauthClient } from '@/types/identity.type';
 import IdentitiesSelectedBase from './IdentitiesSelectedBase.component';
-import IdentityServiceAccountDescriptionCell from './cell/service-account/IdentityServiceAccountDescriptionCell.component';
+import IdentityServiceAccountIdentityCell from './cell/service-account/IdentityServiceAccountIdentityCell.component';
 import IdentityServiceAccountNameCell from './cell/service-account/IdentityServiceAccountNameCell.component';
 import IdentityServiceAccountDeleteActionCell from './cell/service-account/IdentityServiceAccountDeleteActionCell';
 
-const IdentitiesSelectedServiceAccounts = () => {
+type IdentitiesSelectedServiceAccountsProps = {
+  identityURNs: string[];
+};
+
+const IdentitiesSelectedServiceAccounts = ({
+  identityURNs,
+}: IdentitiesSelectedServiceAccountsProps) => {
   const { t } = useTranslation('key-management-service/credential');
   const navigate = useNavigate();
   const { serviceAccountList, setServiceAccountList } = useIdentityData();
@@ -23,10 +29,10 @@ const IdentitiesSelectedServiceAccounts = () => {
       isSortable: false,
     },
     {
-      id: 'description',
-      cell: IdentityServiceAccountDescriptionCell,
+      id: 'identity',
+      cell: IdentityServiceAccountIdentityCell,
       label: t(
-        'key_management_service_credential_user_list_column_description',
+        'key_management_service_credential_create_identities_service-account_tile_identity_label',
       ),
       isSortable: false,
     },
@@ -51,6 +57,7 @@ const IdentitiesSelectedServiceAccounts = () => {
       deleteCallback={() => setServiceAccountList([])}
       datagridColumns={columns}
       items={serviceAccountList}
+      identityURNs={identityURNs}
     ></IdentitiesSelectedBase>
   );
 };
diff --git a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedUsersList.component.tsx b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedUsersList.component.tsx
index 79e1b2a89943..17e532a3ec9a 100644
--- a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedUsersList.component.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/IdentitiesSelectedUsersList.component.tsx
@@ -11,7 +11,12 @@ import IdentityUserGroupCell from './cell/user/IdentityUserGroupCell.component';
 import IdentityUserStatusCell from './cell/user/IdentityUserStatusCell.component';
 import IdentityUserDeleteActionCell from './cell/user/IdentityUserDeleteActionCell';
 
-const IdentitiesSelectedUsersList = () => {
+type IdentitiesSelectedUsersListProps = {
+  identityURNs: string[];
+};
+const IdentitiesSelectedUsersList = ({
+  identityURNs,
+}: IdentitiesSelectedUsersListProps) => {
   const { t } = useTranslation('key-management-service/credential');
   const navigate = useNavigate();
   const { userList, setUserList } = useIdentityData();
@@ -59,6 +64,7 @@ const IdentitiesSelectedUsersList = () => {
       }}
       datagridColumns={columns}
       items={userList}
+      identityURNs={identityURNs}
     ></IdentitiesSelectedBase>
   );
 };
diff --git a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/cell/service-account/IdentityServiceAccountDescriptionCell.component.tsx b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/cell/service-account/IdentityServiceAccountIdentityCell.component.tsx
similarity index 53%
rename from packages/manager/apps/key-management-service/src/pages/credential/create/identities/cell/service-account/IdentityServiceAccountDescriptionCell.component.tsx
rename to packages/manager/apps/key-management-service/src/pages/credential/create/identities/cell/service-account/IdentityServiceAccountIdentityCell.component.tsx
index 14ccda07496b..9a4bb3401142 100644
--- a/packages/manager/apps/key-management-service/src/pages/credential/create/identities/cell/service-account/IdentityServiceAccountDescriptionCell.component.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/credential/create/identities/cell/service-account/IdentityServiceAccountIdentityCell.component.tsx
@@ -2,10 +2,10 @@ import React from 'react';
 import { DataGridTextCell } from '@ovh-ux/manager-react-components';
 import { IdentityOauthClient } from '@/types/identity.type';
 
-const IdentityServiceAccountDescriptionCell = (
+const IdentityServiceAccountIdentityCell = (
   serviceAccount: IdentityOauthClient,
 ) => {
-  return <DataGridTextCell>{serviceAccount.description}</DataGridTextCell>;
+  return <DataGridTextCell>{serviceAccount.identity}</DataGridTextCell>;
 };
 
-export default IdentityServiceAccountDescriptionCell;
+export default IdentityServiceAccountIdentityCell;
diff --git a/packages/manager/apps/key-management-service/src/pages/dashboard/generalInformations/GeneralInformations.tsx b/packages/manager/apps/key-management-service/src/pages/dashboard/generalInformations/GeneralInformations.tsx
index 5e545b4ea5a8..f1f37b1b86e7 100644
--- a/packages/manager/apps/key-management-service/src/pages/dashboard/generalInformations/GeneralInformations.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/dashboard/generalInformations/GeneralInformations.tsx
@@ -14,7 +14,7 @@ function GeneralInformationsTab() {
   const {
     data: okmsService,
     isLoading: isOkmsServiceLoading,
-  } = useKMSServiceInfos(okms?.data);
+  } = useKMSServiceInfos(okms?.data.id);
 
   const navigate = useNavigate();
 
@@ -32,7 +32,10 @@ function GeneralInformationsTab() {
 
   return (
     <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 md:gap-6">
-      <InformationsTile okmsData={okms.data} />
+      <InformationsTile
+        okmsData={okms.data}
+        okmsServiceInfos={okmsService.data}
+      />
       <BillingInformationsTile
         okmsData={okms.data}
         okmsService={okmsService.data}
diff --git a/packages/manager/apps/key-management-service/src/pages/dashboard/generalInformations/updateName/OkmsNameUpdateModal.tsx b/packages/manager/apps/key-management-service/src/pages/dashboard/generalInformations/updateName/OkmsNameUpdateModal.tsx
new file mode 100644
index 000000000000..64d9af11ac0f
--- /dev/null
+++ b/packages/manager/apps/key-management-service/src/pages/dashboard/generalInformations/updateName/OkmsNameUpdateModal.tsx
@@ -0,0 +1,42 @@
+import { UpdateNameModal } from '@ovh-ux/manager-react-components';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate, useParams } from 'react-router-dom';
+import { useUpdateOkmsName } from '@/data/hooks/useUpdateOkmsName';
+import { useKMSServiceInfos } from '@/data/hooks/useKMSServiceInfos';
+
+const OkmsNameUpdateModal = () => {
+  const { t: tDashboard } = useTranslation('key-management-service/dashboard');
+  const { t: tCredential } = useTranslation(
+    'key-management-service/credential',
+  );
+  const { okmsId } = useParams();
+  const { data: okmsServiceInfos, isLoading } = useKMSServiceInfos(okmsId);
+  const navigate = useNavigate();
+  const { updateKmsName, isPending, error } = useUpdateOkmsName({
+    okmsId,
+    onSuccess: () => {
+      navigate('..');
+    },
+  });
+
+  return (
+    <UpdateNameModal
+      headline={tDashboard('key_management_service_dashboard_modal_title')}
+      inputLabel={tCredential(
+        'key_management_service_credential_dashboard_name',
+      )}
+      defaultValue={okmsServiceInfos?.data.resource.displayName}
+      isLoading={isLoading || isPending}
+      error={error?.message}
+      closeModal={() => {
+        navigate('..');
+      }}
+      updateDisplayName={(newDisplayName: string) => {
+        updateKmsName({ okms: okmsId, displayName: newDisplayName });
+      }}
+    ></UpdateNameModal>
+  );
+};
+
+export default OkmsNameUpdateModal;
diff --git a/packages/manager/apps/key-management-service/src/pages/dashboard/index.tsx b/packages/manager/apps/key-management-service/src/pages/dashboard/index.tsx
index 862b081ac235..18a66a1155d4 100644
--- a/packages/manager/apps/key-management-service/src/pages/dashboard/index.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/dashboard/index.tsx
@@ -4,8 +4,8 @@ import { Outlet, useNavigate, useParams } from 'react-router-dom';
 import {
   Notifications,
   BaseLayout,
-  ErrorBanner,
   HeadersProps,
+  ErrorBanner,
 } from '@ovh-ux/manager-react-components';
 import { queryClient } from '@ovh-ux/manager-react-core-application';
 import KmsGuidesHeader from '@/components/Guide/KmsGuidesHeader';
@@ -13,12 +13,13 @@ import Dashboard, {
   DashboardTabItemProps,
 } from '@/components/layout-helpers/Dashboard/Dashboard';
 import Loading from '@/components/Loading/Loading';
-import { useOKMSById } from '@/data/hooks/useOKMS';
 import Breadcrumb from '@/components/Breadcrumb/Breadcrumb';
 import { ROUTES_URLS } from '@/routes/routes.constants';
 import { BreadcrumbItem } from '@/hooks/breadcrumb/useBreadcrumb';
 import { getOkmsResourceQueryKey } from '@/data/api/okms';
 import { OKMS } from '@/types/okms.type';
+import { useKMSServiceInfos } from '@/data/hooks/useKMSServiceInfos';
+import { useOKMSById } from '@/data/hooks/useOKMS';
 
 export const OkmsContext = createContext<OKMS>(null);
 
@@ -32,14 +33,27 @@ export default function DashboardPage() {
     'key-management-service/credential',
   );
   const { okmsId } = useParams();
-  const { data: okms, isLoading, error } = useOKMSById(okmsId);
+  const {
+    data: okms,
+    isLoading: isOkmsLoading,
+    isError: isOkmsError,
+    error: okmsError,
+  } = useOKMSById(okmsId);
 
-  if (isLoading) return <Loading />;
+  const {
+    data: okmsServiceInfos,
+    isLoading: isOkmsServiceInfosLoading,
+    isError: isOkmsServiceInfosError,
+    error: okmsServiceInfoError,
+  } = useKMSServiceInfos(okmsId);
+  const displayName = okmsServiceInfos?.data?.resource.displayName;
 
-  if (error)
+  if (isOkmsServiceInfosLoading || isOkmsLoading) return <Loading />;
+
+  if (isOkmsServiceInfosError || isOkmsError)
     return (
       <ErrorBanner
-        error={error.response}
+        error={okmsServiceInfoError.response || okmsError.response}
         onRedirectHome={() => navigate(ROUTES_URLS.listing)}
         onReloadPage={() =>
           queryClient.refetchQueries({
@@ -67,7 +81,7 @@ export default function DashboardPage() {
   const breadcrumbItems: BreadcrumbItem[] = [
     {
       id: okmsId,
-      label: okms.data.iam.displayName,
+      label: displayName,
       navigateTo: `/${okmsId}`,
     },
     {
@@ -80,10 +94,15 @@ export default function DashboardPage() {
       label: tCredentials('key_management_service_credential'),
       navigateTo: `/${okmsId}/${ROUTES_URLS.credentials}`,
     },
+    {
+      id: ROUTES_URLS.okmsUpdateName,
+      label: tDashboard('key_management_service_update_name'),
+      navigateTo: `/${okmsId}/${ROUTES_URLS.okmsUpdateName}`,
+    },
   ];
 
   const headerProps: HeadersProps = {
-    title: okms.data.iam.displayName,
+    title: displayName,
     headerButton: <KmsGuidesHeader />,
   };
 
diff --git a/packages/manager/apps/key-management-service/src/pages/dashboard/serviceKeyList/ServiceKeyList.page.tsx b/packages/manager/apps/key-management-service/src/pages/dashboard/serviceKeyList/ServiceKeyList.page.tsx
index 5a660992a85b..ff69268c48c6 100644
--- a/packages/manager/apps/key-management-service/src/pages/dashboard/serviceKeyList/ServiceKeyList.page.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/dashboard/serviceKeyList/ServiceKeyList.page.tsx
@@ -1,30 +1,23 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { Outlet, useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
+import { queryClient } from '@ovh-ux/manager-react-core-application';
 import {
-  ODS_SPINNER_SIZE,
   ODS_MESSAGE_TYPE,
   ODS_BUTTON_SIZE,
   ODS_ICON_NAME,
   ODS_ICON_SIZE,
   ODS_BUTTON_VARIANT,
 } from '@ovhcloud/ods-components';
-import {
-  OsdsText,
-  OsdsMessage,
-  OsdsSpinner,
-  OsdsButton,
-  OsdsIcon,
-} from '@ovhcloud/ods-components/react';
+import { OsdsMessage, OsdsIcon } from '@ovhcloud/ods-components/react';
 import {
   Datagrid,
+  Description,
+  ErrorBanner,
+  ManagerButton,
   useDatagridSearchParams,
 } from '@ovh-ux/manager-react-components';
-import {
-  ODS_THEME_COLOR_INTENT,
-  ODS_THEME_TYPOGRAPHY_LEVEL,
-  ODS_THEME_TYPOGRAPHY_SIZE,
-} from '@ovhcloud/ods-common-theming';
+import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
 import {
   DatagridCellType,
   DatagridCreationDate,
@@ -35,6 +28,9 @@ import {
 } from '@/components/Listing/ListingCells';
 import { useOkmsServiceKeys } from '@/data/hooks/useOkmsServiceKeys';
 import { ROUTES_URLS } from '@/routes/routes.constants';
+import { OkmsContext } from '..';
+import Loading from '@/components/Loading/Loading';
+import { getOkmsServiceKeyResourceListQueryKey } from '@/data/api/okmsServiceKey';
 
 export default function Keys() {
   const { t } = useTranslation('key-management-service/serviceKeys');
@@ -75,66 +71,70 @@ export default function Keys() {
   ];
 
   const { sorting, setSorting } = useDatagridSearchParams();
+  const okms = useContext(OkmsContext);
   const { okmsId } = useParams();
   const { error, data: okmsServiceKey, isLoading } = useOkmsServiceKeys({
     sorting,
     okmsId,
   });
 
+  if (isLoading) return <Loading />;
+
+  if (error)
+    return (
+      <ErrorBanner
+        error={error}
+        onRedirectHome={() => navigate(ROUTES_URLS.listing)}
+        onReloadPage={() =>
+          queryClient.refetchQueries({
+            queryKey: getOkmsServiceKeyResourceListQueryKey(okmsId),
+          })
+        }
+      />
+    );
+
   return (
-    <>
-      <div className={'flex mb-3 mt-6'}>
-        <OsdsText
-          level={ODS_THEME_TYPOGRAPHY_LEVEL.body}
-          size={ODS_THEME_TYPOGRAPHY_SIZE._100}
-        >
-          {t('key_management_service_service-keys_headline')}
-        </OsdsText>
-      </div>
+    <div className="flex flex-col gap-8">
+      <Description>
+        {t('key_management_service_service-keys_headline')}
+      </Description>
       {error && (
         <OsdsMessage className="mt-4" type={ODS_MESSAGE_TYPE.error}>
           {tError('manager_error_page_default')}
         </OsdsMessage>
       )}
+      <div>
+        <ManagerButton
+          size={ODS_BUTTON_SIZE.sm}
+          inline
+          color={ODS_THEME_COLOR_INTENT.primary}
+          variant={ODS_BUTTON_VARIANT.stroked}
+          onClick={() => {
+            navigate(ROUTES_URLS.createKmsServiceKey);
+          }}
+          urn={okms.iam.urn}
+          iamActions={['okms:apiovh:resource/serviceKey/create']}
+        >
+          <span slot="start">
+            <OsdsIcon
+              name={ODS_ICON_NAME.ADD}
+              size={ODS_ICON_SIZE.xs}
+              color={ODS_THEME_COLOR_INTENT.primary}
+            ></OsdsIcon>
+          </span>
 
-      {isLoading && !error && (
-        <div className="text-center">
-          <OsdsSpinner inline size={ODS_SPINNER_SIZE.md} />
-        </div>
-      )}
-      <OsdsButton
-        size={ODS_BUTTON_SIZE.sm}
-        inline
-        color={ODS_THEME_COLOR_INTENT.primary}
-        variant={ODS_BUTTON_VARIANT.stroked}
-        className={'xs:mt-2 sm:mt-0 md:mt-8 w-fit h-fit'}
-        onClick={() => {
-          navigate(ROUTES_URLS.createKmsServiceKey);
-        }}
-      >
-        <span slot="start">
-          <OsdsIcon
-            name={ODS_ICON_NAME.ADD}
-            size={ODS_ICON_SIZE.xs}
-            color={ODS_THEME_COLOR_INTENT.primary}
-          ></OsdsIcon>
-        </span>
-
-        {t('key_management_service_service-keys_cta_create')}
-      </OsdsButton>
-      {!isLoading && !error && (
-        <div className={'mt-8'}>
-          <Datagrid
-            columns={columns}
-            items={okmsServiceKey || []}
-            totalItems={0}
-            sorting={sorting}
-            onSortChange={setSorting}
-            contentAlignLeft
-          />
-        </div>
-      )}
+          {t('key_management_service_service-keys_cta_create')}
+        </ManagerButton>
+      </div>
+      <Datagrid
+        columns={columns}
+        items={okmsServiceKey || []}
+        totalItems={0}
+        sorting={sorting}
+        onSortChange={setSorting}
+        contentAlignLeft
+      />
       <Outlet />
-    </>
+    </div>
   );
 }
diff --git a/packages/manager/apps/key-management-service/src/pages/listing/KmsListing.page.spec.tsx b/packages/manager/apps/key-management-service/src/pages/listing/KmsListing.page.spec.tsx
new file mode 100644
index 000000000000..861f4a46d699
--- /dev/null
+++ b/packages/manager/apps/key-management-service/src/pages/listing/KmsListing.page.spec.tsx
@@ -0,0 +1,102 @@
+import { act, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { renderTestApp } from '@/utils/tests/renderTestApp';
+import '@testing-library/jest-dom';
+import { labels } from '@/utils/tests/init.i18n';
+import { okmsList } from '@/mocks/okms.mock';
+
+describe('KMS listing test suite', () => {
+  it('should redirect to the onboarding page when the kms list is empty', async () => {
+    await renderTestApp({ nbOkms: 0 });
+
+    expect(screen.getByText(labels.onboarding.title)).toBeVisible();
+
+    expect(
+      screen.queryByText(labels.listing.key_management_service_listing_title),
+    ).not.toBeInTheDocument();
+  });
+
+  it('should display the kms listing page', async () => {
+    await renderTestApp();
+
+    expect(
+      screen.getByText(labels.listing.key_management_service_listing_title),
+    ).toBeVisible();
+
+    expect(
+      screen.queryByText(labels.onboarding.description),
+    ).not.toBeInTheDocument();
+  });
+
+  it(`should navigate to the kms creation form on click on "${labels.listing.key_management_service_listing_add_kms_button}" button`, async () => {
+    await renderTestApp();
+
+    await waitFor(
+      () =>
+        expect(
+          screen.getByText(
+            labels.listing.key_management_service_listing_add_kms_button,
+          ),
+        ).toBeEnabled(),
+      {
+        timeout: 30_000,
+      },
+    );
+
+    await act(() =>
+      userEvent.click(
+        screen.getByText(
+          labels.listing.key_management_service_listing_add_kms_button,
+        ),
+      ),
+    );
+
+    await waitFor(
+      () =>
+        expect(
+          screen.getByText(
+            labels.create.key_management_service_create_subtitle,
+          ),
+        ).toBeVisible(),
+      { timeout: 30_000 },
+    );
+  });
+
+  it('should navigate to a kms dashboard on click on kms name', async () => {
+    await renderTestApp();
+
+    await act(() =>
+      userEvent.click(screen.getByText(okmsList[0].iam.displayName)),
+    );
+
+    await waitFor(
+      () =>
+        expect(
+          screen.getByText(labels.dashboard.billing_informations),
+        ).toBeVisible(),
+      { timeout: 30_000 },
+    );
+  });
+
+  it(`should navigate to the kms delete modal on click on "${labels.listing.key_management_service_listing_terminate}" list action button`, async () => {
+    await renderTestApp();
+
+    await act(() =>
+      userEvent.click(
+        screen.getByText(
+          labels.listing.key_management_service_listing_terminate,
+        ),
+      ),
+    );
+
+    await waitFor(
+      () =>
+        expect(
+          screen.getByText(
+            labels.terminate.key_management_service_terminate_cancel,
+          ),
+        ).toBeVisible(),
+      { timeout: 30_000 },
+    );
+  });
+});
diff --git a/packages/manager/apps/key-management-service/src/pages/listing/index.tsx b/packages/manager/apps/key-management-service/src/pages/listing/index.tsx
index 2a33977bfaf3..1962ace06416 100644
--- a/packages/manager/apps/key-management-service/src/pages/listing/index.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/listing/index.tsx
@@ -1,24 +1,19 @@
-import React, { Suspense, useEffect } from 'react';
+import React from 'react';
 import { Outlet, useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import {
-  ODS_SPINNER_SIZE,
   ODS_MESSAGE_TYPE,
   ODS_BUTTON_SIZE,
   ODS_BUTTON_VARIANT,
 } from '@ovhcloud/ods-components';
-import {
-  OsdsButton,
-  OsdsMessage,
-  OsdsSpinner,
-} from '@ovhcloud/ods-components/react';
+import { OsdsButton, OsdsMessage } from '@ovhcloud/ods-components/react';
 import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
 import {
   BaseLayout,
   Datagrid,
   HeadersProps,
   Notifications,
-  useDatagridSearchParams,
+  RedirectionGuard,
   useNotifications,
 } from '@ovh-ux/manager-react-components';
 import {
@@ -26,7 +21,7 @@ import {
   PageLocation,
   useOvhTracking,
 } from '@ovh-ux/manager-react-shell-client';
-import { useOKMS } from '@/data/hooks/useOKMS';
+import { useOKMSList } from '@/data/hooks/useOKMS';
 import { ROUTES_URLS } from '@/routes/routes.constants';
 import {
   DatagridActionMenu,
@@ -36,7 +31,6 @@ import {
   DatagridCellStatus,
 } from '@/components/Listing/ListingCells';
 import KmsGuidesHeader from '@/components/Guide/KmsGuidesHeader';
-import Loading from '@/components/Loading/Loading';
 
 export default function Listing() {
   const { t } = useTranslation('key-management-service/listing');
@@ -74,24 +68,35 @@ export default function Listing() {
     },
   ];
 
-  const { sorting, setSorting } = useDatagridSearchParams();
-
-  const { error, data: okms, isLoading } = useOKMS({
-    sorting,
+  const {
+    data,
+    flattenData,
+    fetchNextPage,
+    hasNextPage,
+    isError,
+    isLoading,
+    status,
+  } = useOKMSList({
+    pageSize: 10,
   });
 
-  useEffect(() => {
-    if (okms.length === 0 && !isLoading) {
-      navigate(ROUTES_URLS.onboarding);
-    }
-  }, [okms.length, isLoading]);
-
   const headerProps: HeadersProps = {
     title: t('key_management_service_listing_title'),
     headerButton: <KmsGuidesHeader />,
   };
+
   return (
-    <Suspense fallback={<Loading />}>
+    <RedirectionGuard
+      isLoading={isLoading || !flattenData}
+      condition={status === 'success' && data?.pages[0].data.length === 0}
+      route={ROUTES_URLS.onboarding}
+      isError={isError}
+      errorComponent={
+        <OsdsMessage className="mt-4" type={ODS_MESSAGE_TYPE.error}>
+          {tError('manager_error_page_default')}
+        </OsdsMessage>
+      }
+    >
       <BaseLayout header={headerProps} message={<Notifications />}>
         <div className={'flex mb-3 mt-6'}>
           <OsdsButton
@@ -113,31 +118,20 @@ export default function Listing() {
             {t('key_management_service_listing_add_kms_button')}
           </OsdsButton>
         </div>
-        {error && (
-          <OsdsMessage className="mt-4" type={ODS_MESSAGE_TYPE.error}>
-            {tError('manager_error_page_default')}
-          </OsdsMessage>
-        )}
-
-        {isLoading && !error && (
-          <div className="text-center">
-            <OsdsSpinner inline size={ODS_SPINNER_SIZE.md} />
-          </div>
-        )}
-        {!isLoading && !error && (
+        {flattenData && (
           <div className={'mt-8'}>
             <Datagrid
               columns={columns}
-              items={okms || []}
-              totalItems={0}
-              sorting={sorting}
-              onSortChange={setSorting}
+              items={flattenData}
+              totalItems={flattenData.length || 0}
+              hasNextPage={hasNextPage}
+              onFetchNextPage={() => fetchNextPage()}
               contentAlignLeft
             />
           </div>
         )}
         <Outlet />
       </BaseLayout>
-    </Suspense>
+    </RedirectionGuard>
   );
 }
diff --git a/packages/manager/apps/key-management-service/src/pages/serviceKey/ServiceKey.page.tsx b/packages/manager/apps/key-management-service/src/pages/serviceKey/ServiceKey.page.tsx
index b07ec4555243..a99f0f2b22eb 100644
--- a/packages/manager/apps/key-management-service/src/pages/serviceKey/ServiceKey.page.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/serviceKey/ServiceKey.page.tsx
@@ -3,13 +3,13 @@ import { useTranslation } from 'react-i18next';
 import { useQueryClient } from '@tanstack/react-query';
 import {
   BaseLayout,
+  Clipboard,
   ErrorBanner,
+  ManagerButton,
   Notifications,
-  Clipboard,
 } from '@ovh-ux/manager-react-components';
 import { Outlet, useNavigate, useParams } from 'react-router-dom';
 import {
-  OsdsButton,
   OsdsIcon,
   OsdsTabBar,
   OsdsTabBarItem,
@@ -38,37 +38,49 @@ import { getOkmsServiceKeyResourceQueryKey } from '@/data/api/okmsServiceKey';
 import { BreadcrumbItem } from '@/hooks/breadcrumb/useBreadcrumb';
 import { useOKMSById } from '@/data/hooks/useOKMS';
 import ServiceKeyStateActions from '@/components/serviceKey/serviceKeyStateActions/ServiceKeyStateActions.component';
+import { getOkmsResourceQueryKey } from '@/data/api/okms';
 
 export default function Key() {
   const { okmsId, keyId } = useParams();
-  const { data: okms } = useOKMSById(okmsId);
-  const { data: serviceKey, error, isLoading } = useOkmsServiceKeyById({
-    okmsId,
-    keyId,
-  });
   const { t } = useTranslation('key-management-service/serviceKeys');
   const queryClient = useQueryClient();
-
   const navigate = useNavigate();
 
-  const kms = okms?.data;
-  const kmsKey = serviceKey?.data;
+  const {
+    data: okms,
+    isLoading: isLoadingOkms,
+    error: okmsError,
+  } = useOKMSById(okmsId);
 
-  if (isLoading) return <Loading />;
+  const {
+    data: serviceKey,
+    error: serviceKeyError,
+    isLoading: isLoadingServiceKey,
+  } = useOkmsServiceKeyById({
+    okmsId,
+    keyId,
+  });
 
-  if (error)
+  if (isLoadingServiceKey || isLoadingOkms) return <Loading />;
+
+  if (okmsError || serviceKeyError)
     return (
       <ErrorBanner
-        error={error.response}
+        error={okmsError ? okmsError.response : serviceKeyError.response}
         onRedirectHome={() => navigate(ROUTES_URLS.listing)}
         onReloadPage={() =>
           queryClient.refetchQueries({
-            queryKey: getOkmsServiceKeyResourceQueryKey({ okmsId, keyId }),
+            queryKey: okmsError
+              ? getOkmsResourceQueryKey(okmsId)
+              : getOkmsServiceKeyResourceQueryKey({ okmsId, keyId }),
           })
         }
       />
     );
 
+  const kms = okms.data;
+  const kmsKey = serviceKey.data;
+
   const breadcrumbItems: BreadcrumbItem[] = [
     {
       id: okmsId,
@@ -131,18 +143,20 @@ export default function Key() {
             >
               <div className="flex justify-between items-center">
                 <TileValue value={kmsKey.name} />
-                <OsdsButton
+                <ManagerButton
                   circle
                   variant={ODS_BUTTON_VARIANT.stroked}
                   color={ODS_THEME_COLOR_INTENT.primary}
                   onClick={() => navigate(ROUTES_URLS.serviceKeyEditName)}
+                  urn={kms.iam.urn}
+                  iamActions={['okms:apiovh:resource/serviceKey/update']}
                 >
                   <OsdsIcon
                     name={ODS_ICON_NAME.PEN}
                     size={ODS_ICON_SIZE.xs}
                     color={ODS_THEME_COLOR_INTENT.primary}
                   />
-                </OsdsButton>
+                </ManagerButton>
               </div>
             </TileItem>
             <TileSeparator />
@@ -161,7 +175,7 @@ export default function Key() {
               titleStatus={<ServiceKeyStatus state={kmsKey.state} />}
             >
               <div className="flex flex-col max-w-fit justify-start">
-                <ServiceKeyStateActions okmsId={okmsId} okmsKey={kmsKey} />
+                <ServiceKeyStateActions okms={kms} okmsKey={kmsKey} />
               </div>
             </TileItem>
             <TileSeparator />
diff --git a/packages/manager/apps/key-management-service/src/routes/routes.constants.ts b/packages/manager/apps/key-management-service/src/routes/routes.constants.ts
index c7c47288b056..0041c5ff8b1e 100644
--- a/packages/manager/apps/key-management-service/src/routes/routes.constants.ts
+++ b/packages/manager/apps/key-management-service/src/routes/routes.constants.ts
@@ -5,6 +5,7 @@ export const ROUTES_URLS = {
   terminateOkms: '/terminate',
   createKeyManagementService: 'create',
   okmsId: ':okmsId',
+  okmsUpdateName: 'update-name',
   keys: 'keys',
   keyId: ':keyId',
   createKmsServiceKey: 'create',
diff --git a/packages/manager/apps/key-management-service/src/routes/routes.tsx b/packages/manager/apps/key-management-service/src/routes/routes.tsx
index a37274924b0e..beee6cca23a4 100644
--- a/packages/manager/apps/key-management-service/src/routes/routes.tsx
+++ b/packages/manager/apps/key-management-service/src/routes/routes.tsx
@@ -84,6 +84,16 @@ export default [
                 pageType: PageType.dashboard,
               },
             },
+            children: [
+              {
+                path: ROUTES_URLS.okmsUpdateName,
+                ...lazyRouteConfig(() =>
+                  import(
+                    '@/pages/dashboard/generalInformations/updateName/OkmsNameUpdateModal'
+                  ),
+                ),
+              },
+            ],
           },
           {
             path: ROUTES_URLS.keys,
diff --git a/packages/manager/apps/key-management-service/src/setupTests.ts b/packages/manager/apps/key-management-service/src/setupTests.ts
deleted file mode 100644
index 39d524c2e0e0..000000000000
--- a/packages/manager/apps/key-management-service/src/setupTests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import '@testing-library/jest-dom';
-import { vi } from 'vitest';
-
-vi.mock('react-i18next', () => ({
-  useTranslation: () => ({
-    t: (translationKey: string) => translationKey,
-    i18n: {
-      changeLanguage: () => new Promise(() => {}),
-    },
-  }),
-}));
diff --git a/packages/manager/apps/key-management-service/src/setupTests.tsx b/packages/manager/apps/key-management-service/src/setupTests.tsx
new file mode 100644
index 000000000000..141b5063ffb0
--- /dev/null
+++ b/packages/manager/apps/key-management-service/src/setupTests.tsx
@@ -0,0 +1,39 @@
+import { odsSetup } from '@ovhcloud/ods-common-core';
+import { SetupServer, setupServer } from 'msw/node';
+import { toMswHandlers } from '../../../../../playwright-helpers';
+import { getAuthenticationMocks } from '../../../../../playwright-helpers/mocks/auth';
+import '@testing-library/jest-dom';
+import 'element-internals-polyfill';
+
+odsSetup();
+
+declare global {
+  // eslint-disable-next-line vars-on-top, no-var
+  var server: SetupServer;
+  // eslint-disable-next-line vars-on-top, no-var, @typescript-eslint/naming-convention
+  var __VERSION__: string;
+}
+
+const server = setupServer(
+  ...toMswHandlers([
+    ...getAuthenticationMocks({ isAuthMocked: true, region: 'EU' }),
+  ]),
+);
+
+beforeAll(() => {
+  server.listen({ onUnhandledRequest: 'warn' });
+
+  delete global.server;
+  global.__VERSION__ = null;
+  global.server = server;
+});
+
+afterAll(() => {
+  server.close();
+
+  delete global.__VERSION__;
+});
+
+afterEach(() => {
+  server.resetHandlers();
+});
diff --git a/packages/manager/apps/key-management-service/src/utils/credential/credentialDownload.ts b/packages/manager/apps/key-management-service/src/utils/credential/credentialDownload.ts
index d85895eb1717..821674362799 100644
--- a/packages/manager/apps/key-management-service/src/utils/credential/credentialDownload.ts
+++ b/packages/manager/apps/key-management-service/src/utils/credential/credentialDownload.ts
@@ -19,7 +19,7 @@ export const getDownloadCredentialParameters = (credential: OkmsCredential) => {
           credential.certificatePEM.replace(/\n/g, '\r\n'),
         )}`
       : undefined,
-    filename: `${credential.name}.pem`,
+    filename: `${credential.id}_certificate.pem`,
     isDisabled: isDownloadCredentialDisabled(credential.status),
   };
 };
diff --git a/packages/manager/apps/key-management-service/src/utils/tests/TestApp.tsx b/packages/manager/apps/key-management-service/src/utils/tests/TestApp.tsx
new file mode 100644
index 000000000000..c61879281812
--- /dev/null
+++ b/packages/manager/apps/key-management-service/src/utils/tests/TestApp.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { QueryClientProvider, QueryClient } from '@tanstack/react-query';
+import { createMemoryRouter, RouterProvider } from 'react-router-dom';
+import routes from '@/routes/routes';
+
+export function TestApp() {
+  const router = createMemoryRouter(routes, {
+    initialEntries: ['/'],
+    initialIndex: 0,
+  });
+
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false }, mutations: { retry: false } },
+  });
+
+  return (
+    <QueryClientProvider client={queryClient}>
+      <RouterProvider router={router} />
+    </QueryClientProvider>
+  );
+}
diff --git a/packages/manager/apps/key-management-service/src/utils/tests/init.i18n.ts b/packages/manager/apps/key-management-service/src/utils/tests/init.i18n.ts
new file mode 100644
index 000000000000..d43dbd8afec9
--- /dev/null
+++ b/packages/manager/apps/key-management-service/src/utils/tests/init.i18n.ts
@@ -0,0 +1,75 @@
+import i18next, { i18n } from 'i18next';
+import common from '../../../public/translations/key-management-service/common/Messages_fr_FR.json';
+import create from '../../../public/translations/key-management-service/create/Messages_fr_FR.json';
+import dashboard from '../../../public/translations/key-management-service/dashboard/Messages_fr_FR.json';
+import error from '../../../public/translations/key-management-service/error/Messages_fr_FR.json';
+import guide from '../../../public/translations/key-management-service/guide/Messages_fr_FR.json';
+import listing from '../../../public/translations/key-management-service/listing/Messages_fr_FR.json';
+import onboarding from '../../../public/translations/key-management-service/onboarding/Messages_fr_FR.json';
+import serviceKeys from '../../../public/translations/key-management-service/serviceKeys/Messages_fr_FR.json';
+import terminate from '../../../public/translations/key-management-service/terminate/Messages_fr_FR.json';
+
+export const defaultLocale = 'fr_FR';
+export const defaultAvailableLocales = [defaultLocale];
+
+function addTranslations() {
+  i18next
+    .addResources(defaultLocale, 'key-management-service/common', common)
+    .addResources(defaultLocale, 'key-management-service/create', create)
+    .addResources(defaultLocale, 'key-management-service/dashboard', dashboard)
+    .addResources(defaultLocale, 'key-management-service/error', error)
+    .addResources(defaultLocale, 'key-management-service/guide', guide)
+    .addResources(defaultLocale, 'key-management-service/listing', listing)
+    .addResources(defaultLocale, 'key-management-service/terminate', terminate)
+    .addResources(
+      defaultLocale,
+      'key-management-service/onboarding',
+      onboarding,
+    )
+    .addResources(
+      defaultLocale,
+      'key-management-service/serviceKeys',
+      serviceKeys,
+    )
+    .use({
+      type: 'postProcessor',
+      name: 'normalize',
+      process: (value: string) =>
+        value ? value.replace(/&amp;/g, '&') : value,
+    });
+}
+
+export const initTestI18n = () =>
+  new Promise<i18n>((resolve) => {
+    i18next.init({
+      lng: defaultLocale,
+      defaultNS: 'key-management-service',
+      ns: [],
+      supportedLngs: defaultAvailableLocales,
+      postProcess: 'normalize',
+      interpolation: {
+        escapeValue: false,
+      },
+    });
+
+    if (i18next.isInitialized) {
+      addTranslations();
+    } else {
+      i18next.on('initialized', () => {
+        addTranslations();
+        resolve(i18next);
+      });
+    }
+  });
+
+export const labels = {
+  common,
+  create,
+  dashboard,
+  error,
+  guide,
+  listing,
+  onboarding,
+  serviceKeys,
+  terminate,
+};
diff --git a/packages/manager/apps/key-management-service/src/utils/tests/renderTestApp.tsx b/packages/manager/apps/key-management-service/src/utils/tests/renderTestApp.tsx
new file mode 100644
index 000000000000..8849615ba54a
--- /dev/null
+++ b/packages/manager/apps/key-management-service/src/utils/tests/renderTestApp.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import {
+  initShellContext,
+  ShellContext,
+  ShellContextType,
+} from '@ovh-ux/manager-react-shell-client';
+import { i18n } from 'i18next';
+import { I18nextProvider } from 'react-i18next';
+import { render, waitFor, screen } from '@testing-library/react';
+import { TestApp } from './TestApp';
+import { initTestI18n } from './init.i18n';
+import { toMswHandlers } from '../../../../../../../playwright-helpers';
+import { getAuthenticationMocks } from '../../../../../../../playwright-helpers/mocks/auth';
+import { getOkmsMocks, GetOkmsMocksParams } from '@/mocks/okms.mock';
+import { getServicesMocks } from '@/mocks/services.mock';
+
+let context: ShellContextType;
+let i18nValue: i18n;
+
+export const renderTestApp = async (mockParams: GetOkmsMocksParams = {}) => {
+  global.server?.resetHandlers(
+    ...toMswHandlers([
+      ...getAuthenticationMocks({ isAuthMocked: true }),
+      ...getOkmsMocks(mockParams),
+      ...getServicesMocks(),
+    ]),
+  );
+
+  if (!context) {
+    context = await initShellContext('key-management-service');
+  }
+
+  if (!i18nValue) {
+    i18nValue = await initTestI18n();
+  }
+
+  const result = render(
+    <I18nextProvider i18n={i18nValue}>
+      <ShellContext.Provider value={context}>
+        <TestApp />
+      </ShellContext.Provider>
+    </I18nextProvider>,
+  );
+
+  await waitFor(
+    () =>
+      expect(
+        screen.getAllByText('Key Management Service', { exact: false }).length,
+      ).toBeGreaterThan(0),
+    { timeout: 30000 },
+  );
+
+  return result;
+};
diff --git a/packages/manager/apps/key-management-service/vitest.config.js b/packages/manager/apps/key-management-service/vitest.config.js
index 156daa6627e5..51634113d665 100644
--- a/packages/manager/apps/key-management-service/vitest.config.js
+++ b/packages/manager/apps/key-management-service/vitest.config.js
@@ -8,7 +8,7 @@ export default defineConfig({
   test: {
     globals: true,
     environment: 'jsdom',
-    setupFiles: './src/setupTests.ts',
+    setupFiles: './src/setupTests.tsx',
     coverage: {
       include: ['src'],
       exclude: [
@@ -25,6 +25,17 @@ export default defineConfig({
         'src/queryClient.ts',
       ],
     },
+    testTimeout: 60_000,
+    fileParallelism: false,
+    maxWorkers: 1,
+    pollOptions: {
+      forks: {
+        singleFork: true,
+      },
+      threads: {
+        singleThread: true,
+      },
+    },
   },
   resolve: {
     alias: {
diff --git a/packages/manager/apps/netapp/CHANGELOG.md b/packages/manager/apps/netapp/CHANGELOG.md
index 68be9c104480..b2a34924a580 100644
--- a/packages/manager/apps/netapp/CHANGELOG.md
+++ b/packages/manager/apps/netapp/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.8.37](https://github.com/ovh/manager/compare/@ovh-ux/manager-netapp-app@0.8.36...@ovh-ux/manager-netapp-app@0.8.37) (2024-10-29)
+
+**Note:** Version bump only for package @ovh-ux/manager-netapp-app
+
+
+
+
+
 ## [0.8.36](https://github.com/ovh/manager/compare/@ovh-ux/manager-netapp-app@0.8.35...@ovh-ux/manager-netapp-app@0.8.36) (2024-10-24)
 
 
diff --git a/packages/manager/apps/netapp/package.json b/packages/manager/apps/netapp/package.json
index 4b4db3fc0c1a..fc8398c0607b 100644
--- a/packages/manager/apps/netapp/package.json
+++ b/packages/manager/apps/netapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ovh-ux/manager-netapp-app",
-  "version": "0.8.36",
+  "version": "0.8.37",
   "private": true,
   "description": "NetApp standalone application",
   "repository": {
@@ -28,7 +28,7 @@
     "@ovh-ux/manager-error-page": "^2.4.1",
     "@ovh-ux/manager-filters": "^0.1.0 || ^1.1.1",
     "@ovh-ux/manager-models": "^1.14.17",
-    "@ovh-ux/manager-netapp": "^1.15.5",
+    "@ovh-ux/manager-netapp": "^1.16.0",
     "@ovh-ux/manager-ng-layout-helpers": "^2.9.1",
     "@ovh-ux/ng-at-internet": "^5.11.17",
     "@ovh-ux/ng-at-internet-ui-router-plugin": "^3.5.0",
diff --git a/packages/manager/apps/pci-databases-analytics/CHANGELOG.md b/packages/manager/apps/pci-databases-analytics/CHANGELOG.md
index 46d52d7a5a11..a1da3fbc1a6f 100644
--- a/packages/manager/apps/pci-databases-analytics/CHANGELOG.md
+++ b/packages/manager/apps/pci-databases-analytics/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.6](https://github.com/ovh/manager/compare/@ovh-ux/manager-pci-databases-analytics-app@1.6.5...@ovh-ux/manager-pci-databases-analytics-app@1.6.6) (2024-10-30)
+
+**Note:** Version bump only for package @ovh-ux/manager-pci-databases-analytics-app
+
+
+
+
+
 ## [1.6.5](https://github.com/ovh/manager/compare/@ovh-ux/manager-pci-databases-analytics-app@1.6.4...@ovh-ux/manager-pci-databases-analytics-app@1.6.5) (2024-10-28)
 
 
diff --git a/packages/manager/apps/pci-databases-analytics/package.json b/packages/manager/apps/pci-databases-analytics/package.json
index d364203cf991..a25bcb31506a 100644
--- a/packages/manager/apps/pci-databases-analytics/package.json
+++ b/packages/manager/apps/pci-databases-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ovh-ux/manager-pci-databases-analytics-app",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "private": true,
   "description": "pci-databases-analytics",
   "repository": {
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/queries/Queries.page.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/queries/Queries.page.tsx
index c454c22ce2c4..9757cf242746 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/queries/Queries.page.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/queries/Queries.page.tsx
@@ -30,7 +30,10 @@ const Queries = () => {
       {service.capabilities.currentQueries?.read ===
         database.service.capability.StateEnum.enabled && <CurrentQueries />}
       {service.capabilities.queryStatistics?.read ===
-        database.service.capability.StateEnum.enabled && <QueryStatistics />}
+        database.service.capability.StateEnum.enabled &&
+        service.engine === database.EngineEnum.postgresql && (
+          <QueryStatistics />
+        )}
     </>
   );
 };
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/queries/Queries.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/queries/Queries.spec.tsx
index 070b42656a1f..64367d3b259f 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/queries/Queries.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/queries/Queries.spec.tsx
@@ -24,7 +24,7 @@ import {
 // Override mock to add capabilities
 const mockedService = {
   ...mockedServiceOrig,
-  engine: database.EngineEnum.mysql,
+  engine: database.EngineEnum.postgresql,
   capabilities: {
     currentQueries: {
       read: database.service.capability.StateEnum.enabled,
diff --git a/packages/manager/modules/netapp/CHANGELOG.md b/packages/manager/modules/netapp/CHANGELOG.md
index b6891f3f31af..dfd407f66b3f 100644
--- a/packages/manager/modules/netapp/CHANGELOG.md
+++ b/packages/manager/modules/netapp/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.16.0](https://github.com/ovh/manager/compare/@ovh-ux/manager-netapp@1.15.5...@ovh-ux/manager-netapp@1.16.0) (2024-10-29)
+
+
+### Features
+
+* **dedicated:** remove unavailable option in snapshot ([#13562](https://github.com/ovh/manager/issues/13562)) ([39930cc](https://github.com/ovh/manager/commit/39930cc8df787895128eb37dc80508097311f79f))
+
+
+
+
+
 ## [1.15.5](https://github.com/ovh/manager/compare/@ovh-ux/manager-netapp@1.15.4...@ovh-ux/manager-netapp@1.15.5) (2024-10-24)
 
 
diff --git a/packages/manager/modules/netapp/package.json b/packages/manager/modules/netapp/package.json
index 83b27a1154b4..62fb66a92c59 100644
--- a/packages/manager/modules/netapp/package.json
+++ b/packages/manager/modules/netapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ovh-ux/manager-netapp",
-  "version": "1.15.5",
+  "version": "1.16.0",
   "private": true,
   "description": "NetApp product.",
   "repository": {
diff --git a/packages/manager/modules/netapp/src/dashboard/volumes/dashboard/snapshots/controller.js b/packages/manager/modules/netapp/src/dashboard/volumes/dashboard/snapshots/controller.js
index bdb26b986346..ae0d2a837238 100644
--- a/packages/manager/modules/netapp/src/dashboard/volumes/dashboard/snapshots/controller.js
+++ b/packages/manager/modules/netapp/src/dashboard/volumes/dashboard/snapshots/controller.js
@@ -1,4 +1,4 @@
-import { MAXIMUM_SNAPSHOT_ALLOWED } from './constants';
+import { MAXIMUM_SNAPSHOT_ALLOWED, SNAPSHOT_TYPE } from './constants';
 
 export default class NetAppVolumesDashboardSnapshotsController {
   /* @ngInject */
@@ -10,6 +10,7 @@ export default class NetAppVolumesDashboardSnapshotsController {
 
   $onInit() {
     this.policyId = this.currentPolicy.id;
+    this.SNAPSHOT_TYPE = SNAPSHOT_TYPE;
   }
 
   isApplicablePolicy() {
diff --git a/packages/manager/modules/netapp/src/dashboard/volumes/dashboard/snapshots/template.html b/packages/manager/modules/netapp/src/dashboard/volumes/dashboard/snapshots/template.html
index daadd14cfc17..2ce6f1599ce9 100644
--- a/packages/manager/modules/netapp/src/dashboard/volumes/dashboard/snapshots/template.html
+++ b/packages/manager/modules/netapp/src/dashboard/volumes/dashboard/snapshots/template.html
@@ -80,9 +80,12 @@ <h2 data-translate="netapp_volumes_snapshots"></h2>
             <oui-action-menu
                 text="{{:: 'netapp_volumes_snapshots_actions' | translate }}"
                 compact
-                disabled="$row.isBeingDeleted()"
+                disabled="$row.type === $ctrl.SNAPSHOT_TYPE.SYSTEM || $row.isBeingDeleted()"
             >
-                <oui-action-menu-item on-click="$ctrl.editSnapshot($row.id)">
+                <oui-action-menu-item
+                    data-ng-if="$row.type !== $ctrl.SNAPSHOT_TYPE.AUTOMATIC"
+                    on-click="$ctrl.editSnapshot($row.id)"
+                >
                     <span
                         data-translate="netapp_volumes_snapshots_actions_edit"
                     ></span>