diff --git a/package-lock.json b/package-lock.json
index 031831436..502f3d61a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
                 "@testing-library/jest-dom": "^6.4.5",
                 "@testing-library/react": "^16.0.0",
                 "@types/jest": "^29.5.12",
-                "@types/node": "^20.14.1",
+                "@types/node": "^20.14.2",
                 "@types/react": "^18.3.3",
                 "@types/react-dom": "^18.3.0",
                 "@types/uuid": "^9.0.8",
@@ -52,7 +52,7 @@
                 "jest-environment-jsdom": "^29.7.0",
                 "knip": "^5.17.4",
                 "openapi-typescript-codegen": "^0.29.0",
-                "prettier": "3.3.0",
+                "prettier": "3.3.1",
                 "prettier-plugin-organize-imports": "^3.2.4",
                 "release-it": "^17.3.0",
                 "ts-jest": "^29.1.4",
@@ -5004,9 +5004,9 @@
             "dev": true
         },
         "node_modules/@types/node": {
-            "version": "20.14.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.1.tgz",
-            "integrity": "sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==",
+            "version": "20.14.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz",
+            "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
             "dev": true,
             "dependencies": {
                 "undici-types": "~5.26.4"
@@ -14530,9 +14530,9 @@
             }
         },
         "node_modules/prettier": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz",
-            "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz",
+            "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==",
             "dev": true,
             "bin": {
                 "prettier": "bin/prettier.cjs"
diff --git a/package.json b/package.json
index c2154505f..b87c10d7e 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
         "@testing-library/jest-dom": "^6.4.5",
         "@testing-library/react": "^16.0.0",
         "@types/jest": "^29.5.12",
-        "@types/node": "^20.14.1",
+        "@types/node": "^20.14.2",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
         "@types/uuid": "^9.0.8",
@@ -126,7 +126,7 @@
         "jest-environment-jsdom": "^29.7.0",
         "knip": "^5.17.4",
         "openapi-typescript-codegen": "^0.29.0",
-        "prettier": "3.3.0",
+        "prettier": "3.3.1",
         "prettier-plugin-organize-imports": "^3.2.4",
         "release-it": "^17.3.0",
         "ts-jest": "^29.1.4",
diff --git a/src/components/content/catalog/services/details/ServiceDetail.tsx b/src/components/content/catalog/services/details/ServiceDetail.tsx
index 1166bd076..af65755b0 100644
--- a/src/components/content/catalog/services/details/ServiceDetail.tsx
+++ b/src/components/content/catalog/services/details/ServiceDetail.tsx
@@ -45,6 +45,9 @@ function ServiceDetail({ serviceDetails }: { serviceDetails: ServiceTemplateDeta
                 <Descriptions.Item label='Service' labelStyle={{ width: '230px' }}>
                     <ShowIcon serviceDetails={serviceDetails} />
                 </Descriptions.Item>
+                <Descriptions.Item label='ServiceTemplateId' labelStyle={{ width: '230px' }}>
+                    {serviceDetails.id}
+                </Descriptions.Item>
                 <Descriptions.Item label='Description' labelStyle={{ width: '230px' }}>
                     {serviceDetails.description}
                 </Descriptions.Item>
@@ -69,7 +72,7 @@ function ServiceDetail({ serviceDetails }: { serviceDetails: ServiceTemplateDeta
                     <BillingText billing={serviceDetails.billing} />
                 </Descriptions.Item>
                 <Descriptions.Item label={'Service API'}>
-                    <ApiDoc id={serviceDetails.id} styleClass={appStyles.serviceApiDocLink} />
+                    <ApiDoc id={serviceDetails.serviceTemplateId} styleClass={appStyles.serviceApiDocLink} />
                 </Descriptions.Item>
                 <Descriptions.Item label='Contact Details'>
                     <ContactDetailsText
diff --git a/src/components/content/catalog/services/details/ServiceProvider.tsx b/src/components/content/catalog/services/details/ServiceProvider.tsx
index 123245eec..1a4926064 100644
--- a/src/components/content/catalog/services/details/ServiceProvider.tsx
+++ b/src/components/content/catalog/services/details/ServiceProvider.tsx
@@ -186,9 +186,9 @@ function ServiceProvider({
                 <>
                     {activeServiceDetail ? (
                         <>
-                            <UnregisterResult id={activeServiceDetail.id} category={category} />
-                            <ReRegisterResult id={activeServiceDetail.id} category={category} />
-                            <DeleteResult id={activeServiceDetail.id} category={category} />
+                            <UnregisterResult id={activeServiceDetail.serviceTemplateId} category={category} />
+                            <ReRegisterResult id={activeServiceDetail.serviceTemplateId} category={category} />
+                            <DeleteResult id={activeServiceDetail.serviceTemplateId} category={category} />
                             <Tabs
                                 items={items}
                                 onChange={onChangeCsp}
@@ -197,24 +197,24 @@ function ServiceProvider({
                             />
                             <div className={catalogStyles.updateUnregisterBtnClass}>
                                 <UpdateService
-                                    id={activeServiceDetail.id}
+                                    id={activeServiceDetail.serviceTemplateId}
                                     category={category}
                                     isViewDisabled={isViewDisabled}
                                 />
                                 <UnregisterService
-                                    id={activeServiceDetail.id}
+                                    id={activeServiceDetail.serviceTemplateId}
                                     setIsViewDisabled={setIsViewDisabled}
                                     serviceRegistrationState={activeServiceDetail.serviceRegistrationState}
                                 />
                                 <ReRegisterService
-                                    id={activeServiceDetail.id}
+                                    id={activeServiceDetail.serviceTemplateId}
                                     setIsViewDisabled={setIsViewDisabled}
                                     isReRegisterDisabled={isReRegisterDisabled}
                                     setIsDeleteDisabled={setIsDeleteDisabled}
                                     serviceRegistrationState={activeServiceDetail.serviceRegistrationState}
                                 />
                                 <DeleteService
-                                    id={activeServiceDetail.id}
+                                    id={activeServiceDetail.serviceTemplateId}
                                     setIsViewDisabled={setIsViewDisabled}
                                     isDeleteDisabled={isDeleteDisabled}
                                     setIsReRegisterDisabled={setIsReRegisterDisabled}
@@ -233,7 +233,7 @@ function ServiceProvider({
                             />
                             <ServiceDetail serviceDetails={activeServiceDetail} />
                             <ServicePolicies
-                                key={activeServiceDetail.id}
+                                key={activeServiceDetail.serviceTemplateId}
                                 serviceDetails={activeServiceDetail}
                                 isViewDisabled={isViewDisabled}
                             />
diff --git a/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx b/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx
index 9a9a9b21f..9d0cbebfa 100644
--- a/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx
+++ b/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx
@@ -61,7 +61,7 @@ export const AddOrUpdateServicePolicy = ({
             };
             setCreatePolicyRequest(policyCreateRequest);
             createServicePoliciesRequest.mutate(policyCreateRequest);
-        } else if (currentServicePolicy.id.length > 0) {
+        } else if (currentServicePolicy.servicePolicyId.length > 0) {
             // Check whether the modified data has changed
             if (comparePolicyUpdateRequestResult(policyRequest, currentServicePolicy)) {
                 setIsUpdated(comparePolicyUpdateRequestResult(policyRequest, currentServicePolicy));
@@ -75,7 +75,7 @@ export const AddOrUpdateServicePolicy = ({
             };
             setUpdatePolicyRequest(policyUpdateRequest);
             updatePoliciesManagementServiceRequest.mutate({
-                id: currentServicePolicy.id,
+                id: currentServicePolicy.servicePolicyId,
                 policyUpdateRequest: policyUpdateRequest,
             });
         }
@@ -214,12 +214,12 @@ export const AddOrUpdateServicePolicy = ({
                 initialValues={{
                     remember: true,
                     enabled:
-                        currentServicePolicy !== undefined && currentServicePolicy.id.length > 0
+                        currentServicePolicy !== undefined && currentServicePolicy.servicePolicyId.length > 0
                             ? currentServicePolicy.enabled
                             : false,
                     flavors:
                         currentServicePolicy !== undefined &&
-                        currentServicePolicy.id.length > 0 &&
+                        currentServicePolicy.servicePolicyId.length > 0 &&
                         currentServicePolicy.flavorNameList
                             ? currentServicePolicy.flavorNameList
                             : [],
diff --git a/src/components/content/catalog/services/policies/ServicePolicies.tsx b/src/components/content/catalog/services/policies/ServicePolicies.tsx
index e18c4945f..0c421066d 100644
--- a/src/components/content/catalog/services/policies/ServicePolicies.tsx
+++ b/src/components/content/catalog/services/policies/ServicePolicies.tsx
@@ -28,7 +28,7 @@ export const ServicePolicies = ({
     const [currentServicePolicy, setCurrentServicePolicy] = useState<ServicePolicy | undefined>(undefined);
     const [isOpenAddOrUpdatePolicyModal, setIsOpenAddOrUpdatePolicyModal] = useState<boolean>(false);
 
-    const servicePolicyListQuery = useGetServicePolicyList(serviceDetails.id);
+    const servicePolicyListQuery = useGetServicePolicyList(serviceDetails.serviceTemplateId);
     const deleteServicePolicyRequest = useDeleteServicePolicy();
 
     const refreshServicePoliciesList = () => {
@@ -52,7 +52,7 @@ export const ServicePolicies = ({
     const columns: ColumnsType<ServicePolicy> = [
         {
             title: 'Policy ID',
-            dataIndex: 'id',
+            dataIndex: 'servicePolicyId',
         },
         {
             title: 'Content',
@@ -134,7 +134,7 @@ export const ServicePolicies = ({
                                     type='primary'
                                     icon={<CloseCircleOutlined />}
                                     loading={
-                                        record.id === currentPolicyId &&
+                                        record.servicePolicyId === currentPolicyId &&
                                         !deleteServicePolicyRequest.isSuccess &&
                                         deleteServicePolicyRequest.isError
                                     }
@@ -156,8 +156,8 @@ export const ServicePolicies = ({
     ];
 
     const deleteCurrentServicePolicy = (record: ServicePolicy) => {
-        setCurrentPolicyId(record.id);
-        deleteServicePolicyRequest.mutate(record.id);
+        setCurrentPolicyId(record.servicePolicyId);
+        deleteServicePolicyRequest.mutate(record.servicePolicyId);
     };
 
     const addServicePolicies = () => {
@@ -250,7 +250,7 @@ export const ServicePolicies = ({
                 onCancel={closeAddOrUpdateServicePolicyModal}
             >
                 <AddOrUpdateServicePolicy
-                    serviceTemplateId={serviceDetails.id}
+                    serviceTemplateId={serviceDetails.serviceTemplateId}
                     currentServicePolicy={currentServicePolicy}
                     getCancelUpdateStatus={getCancelUpdateStatus}
                     serviceDetails={serviceDetails}
diff --git a/src/components/content/catalog/services/policies/addPolicy/ServicePolicyCreateResultStatus.tsx b/src/components/content/catalog/services/policies/addPolicy/ServicePolicyCreateResultStatus.tsx
index 330569a71..ba7b73feb 100644
--- a/src/components/content/catalog/services/policies/addPolicy/ServicePolicyCreateResultStatus.tsx
+++ b/src/components/content/catalog/services/policies/addPolicy/ServicePolicyCreateResultStatus.tsx
@@ -62,7 +62,7 @@ export default function ServicePolicyCreateResultStatus({
                     description={
                         <ServicePolicySubmitResult
                             msg={'Policy created successfully'}
-                            uuid={currentServicePolicy === undefined ? '' : currentServicePolicy.id}
+                            uuid={currentServicePolicy === undefined ? '' : currentServicePolicy.servicePolicyId}
                         />
                     }
                     showIcon
diff --git a/src/components/content/catalog/services/policies/updatePolicy/ServicePolicyUpdateResultStatus.tsx b/src/components/content/catalog/services/policies/updatePolicy/ServicePolicyUpdateResultStatus.tsx
index cabfaef69..6c90a2e83 100644
--- a/src/components/content/catalog/services/policies/updatePolicy/ServicePolicyUpdateResultStatus.tsx
+++ b/src/components/content/catalog/services/policies/updatePolicy/ServicePolicyUpdateResultStatus.tsx
@@ -62,7 +62,7 @@ export default function ServicePolicyUpdateResultStatus({
                     description={
                         <ServicePolicySubmitResult
                             msg={'Policy updated successfully'}
-                            uuid={currentServicePolicy === undefined ? '' : currentServicePolicy.id}
+                            uuid={currentServicePolicy === undefined ? '' : currentServicePolicy.servicePolicyId}
                         />
                     }
                     showIcon
diff --git a/src/components/content/catalog/services/update/UpdateService.tsx b/src/components/content/catalog/services/update/UpdateService.tsx
index 641a41070..31bf0765b 100644
--- a/src/components/content/catalog/services/update/UpdateService.tsx
+++ b/src/components/content/catalog/services/update/UpdateService.tsx
@@ -49,7 +49,7 @@ function UpdateService({
         },
         onSuccess: (serviceTemplateVo: ServiceTemplateDetailVo) => {
             files.current[0].status = 'done';
-            updateResult.current = [`ID - ${serviceTemplateVo.id}`];
+            updateResult.current = [`ID - ${serviceTemplateVo.serviceTemplateId}`];
         },
         onError: (error: Error) => {
             files.current[0].status = 'error';
diff --git a/src/components/content/deployedServices/myServices/MyServiceHistory.tsx b/src/components/content/deployedServices/myServices/MyServiceHistory.tsx
index 28c558ebf..1a17b6447 100644
--- a/src/components/content/deployedServices/myServices/MyServiceHistory.tsx
+++ b/src/components/content/deployedServices/myServices/MyServiceHistory.tsx
@@ -24,7 +24,7 @@ export const MyServiceHistory = ({
     deployedService: DeployedServiceDetails | VendorHostedDeployedServiceDetails;
 }): React.JSX.Element => {
     let serviceModificationAuditHistoryList: ServiceModificationAuditDetails[] = [];
-    const listServiceModifyHistoryQuery = useListServiceModifyHistoryQuery(deployedService.id);
+    const listServiceModifyHistoryQuery = useListServiceModifyHistoryQuery(deployedService.serviceId);
 
     if (listServiceModifyHistoryQuery.isSuccess && listServiceModifyHistoryQuery.data.length > 0) {
         serviceModificationAuditHistoryList = listServiceModifyHistoryQuery.data;
@@ -33,7 +33,7 @@ export const MyServiceHistory = ({
     const columns: ColumnsType<ServiceModificationAuditDetails> = [
         {
             title: 'ModifyId',
-            dataIndex: 'id',
+            dataIndex: 'serviceModificationRequestId',
             align: 'center',
             width: 100,
             className: serviceModifyStyles.modifyHistoryValue,
diff --git a/src/components/content/deployedServices/myServices/MyServices.tsx b/src/components/content/deployedServices/myServices/MyServices.tsx
index b612188bb..1b12675f6 100644
--- a/src/components/content/deployedServices/myServices/MyServices.tsx
+++ b/src/components/content/deployedServices/myServices/MyServices.tsx
@@ -107,7 +107,7 @@ function MyServices(): React.JSX.Element {
     const listDeployedServicesQuery = useListDeployedServicesDetailsQuery();
     const getOrderableServiceDetails = useGetOrderableServiceDetailsQuery(activeRecord?.serviceTemplateId);
     const getServiceDetailsByIdQuery = useServiceDetailsPollingQuery(
-        activeRecord?.id,
+        activeRecord?.serviceId,
         serviceDestroyQuery.isSuccess,
         activeRecord?.serviceHostingType ?? DeployedService.serviceHostingType.SELF,
         [
@@ -117,21 +117,21 @@ function MyServices(): React.JSX.Element {
     );
 
     const getStartServiceDetailsQuery = useServiceDetailsByServiceStatePollingQuery(
-        activeRecord?.id,
+        activeRecord?.serviceId,
         serviceStateStartQuery.isSuccess,
         activeRecord?.serviceHostingType ?? DeployedService.serviceHostingType.SELF,
         [DeployedServiceDetails.serviceState.RUNNING, DeployedServiceDetails.serviceState.STOPPED]
     );
 
     const getStopServiceDetailsQuery = useServiceDetailsByServiceStatePollingQuery(
-        activeRecord?.id,
+        activeRecord?.serviceId,
         serviceStateStopQuery.isSuccess,
         activeRecord?.serviceHostingType ?? DeployedService.serviceHostingType.SELF,
         [DeployedServiceDetails.serviceState.STOPPED, DeployedServiceDetails.serviceState.RUNNING]
     );
 
     const getRestartServiceDetailsQuery = useServiceDetailsByServiceStatePollingQuery(
-        activeRecord?.id,
+        activeRecord?.serviceId,
         serviceStateRestartQuery.isSuccess,
         activeRecord?.serviceHostingType ?? DeployedService.serviceHostingType.SELF,
         [DeployedServiceDetails.serviceState.RUNNING]
@@ -147,7 +147,7 @@ function MyServices(): React.JSX.Element {
     ]);
 
     const getPurgeServiceDetailsQuery = usePurgeRequestStatusQuery(
-        activeRecord?.id,
+        activeRecord?.serviceId,
         activeRecord?.serviceHostingType ?? DeployedService.serviceHostingType.SELF,
         servicePurgeQuery.isSuccess
     );
@@ -162,7 +162,9 @@ function MyServices(): React.JSX.Element {
                 serviceStateInQuery.includes(serviceVo.serviceState)
             );
         } else if (serviceIdInQuery) {
-            serviceVoList = listDeployedServicesQuery.data.filter((serviceVo) => serviceVo.id === serviceIdInQuery);
+            serviceVoList = listDeployedServicesQuery.data.filter(
+                (serviceVo) => serviceVo.serviceId === serviceIdInQuery
+            );
         } else {
             serviceVoList = listDeployedServicesQuery.data;
         }
@@ -645,7 +647,7 @@ function MyServices(): React.JSX.Element {
         }
 
         if (
-            activeRecord?.id === record.id &&
+            activeRecord?.serviceId === record.serviceId &&
             (serviceStateStartQuery.isPending || serviceStateStopQuery.isPending || serviceStateRestartQuery.isPending)
         ) {
             return true;
@@ -673,7 +675,7 @@ function MyServices(): React.JSX.Element {
         }
 
         if (
-            activeRecord?.id === record.id &&
+            activeRecord?.serviceId === record.serviceId &&
             (serviceStateStartQuery.isPending || serviceStateStopQuery.isPending || serviceStateRestartQuery.isPending)
         ) {
             return true;
@@ -730,11 +732,11 @@ function MyServices(): React.JSX.Element {
     const columns: ColumnsType<DeployedService> = [
         {
             title: 'Id',
-            dataIndex: 'id',
+            dataIndex: 'serviceId',
             filters: serviceIdInQuery ? undefined : serviceIdFilters,
             filterMode: 'tree',
             filterSearch: true,
-            onFilter: (value: React.Key | boolean, record) => record.id.startsWith(value.toString()),
+            onFilter: (value: React.Key | boolean, record) => record.serviceId.startsWith(value.toString()),
             filtered: !!serviceIdInQuery,
             align: 'center',
         },
@@ -911,7 +913,7 @@ function MyServices(): React.JSX.Element {
                 ? (record as DeployedServiceDetails)
                 : (record as VendorHostedDeployedServiceDetails)
         );
-        servicePurgeQuery.mutate(record.id);
+        servicePurgeQuery.mutate(record.serviceId);
         record.serviceDeploymentState = DeployedService.serviceDeploymentState.DESTROYING;
     };
 
@@ -936,7 +938,7 @@ function MyServices(): React.JSX.Element {
                 ? (record as DeployedServiceDetails)
                 : (record as VendorHostedDeployedServiceDetails)
         );
-        serviceDestroyQuery.mutate(record.id);
+        serviceDestroyQuery.mutate(record.serviceId);
         record.serviceDeploymentState = DeployedService.serviceDeploymentState.DESTROYING;
     }
 
@@ -1031,7 +1033,7 @@ function MyServices(): React.JSX.Element {
         const filters: ColumnFilterItem[] = [];
         const serviceIdSet = new Set<string>('');
         resp.forEach((v) => {
-            serviceIdSet.add(v.id);
+            serviceIdSet.add(v.serviceId);
         });
         serviceIdSet.forEach((id) => {
             const filter = {
@@ -1261,7 +1263,7 @@ function MyServices(): React.JSX.Element {
         <div className={tableStyles.genericTableContainer}>
             {isDestroyRequestSubmitted && activeRecord ? (
                 <DestroyServiceStatusAlert
-                    key={activeRecord.id}
+                    key={activeRecord.serviceId}
                     deployedService={activeRecord}
                     destroySubmitError={serviceDestroyQuery.error}
                     statusPollingError={getServiceDetailsByIdQuery.error}
@@ -1271,7 +1273,7 @@ function MyServices(): React.JSX.Element {
             ) : null}
             {isStartRequestSubmitted && activeRecord ? (
                 <StartServiceStatusAlert
-                    key={activeRecord.id}
+                    key={activeRecord.serviceId}
                     deployedService={activeRecord}
                     serviceStateStartQuery={serviceStateStartQuery}
                     closeStartResultAlert={closeStartResultAlert}
@@ -1280,7 +1282,7 @@ function MyServices(): React.JSX.Element {
             ) : null}
             {isStopRequestSubmitted && activeRecord ? (
                 <StopServiceStatusAlert
-                    key={activeRecord.id}
+                    key={activeRecord.serviceId}
                     deployedService={activeRecord}
                     serviceStateStopQuery={serviceStateStopQuery}
                     closeStopResultAlert={closeStopResultAlert}
@@ -1289,7 +1291,7 @@ function MyServices(): React.JSX.Element {
             ) : null}
             {isRestartRequestSubmitted && activeRecord ? (
                 <RestartServiceStatusAlert
-                    key={activeRecord.id}
+                    key={activeRecord.serviceId}
                     deployedService={activeRecord}
                     serviceStateRestartQuery={serviceStateRestartQuery}
                     closeRestartResultAlert={closeRestartResultAlert}
@@ -1298,7 +1300,7 @@ function MyServices(): React.JSX.Element {
             ) : null}
             {isPurgeRequestSubmitted && activeRecord ? (
                 <PurgeServiceStatusAlert
-                    key={activeRecord.id}
+                    key={activeRecord.serviceId}
                     deployedService={activeRecord}
                     purgeSubmitError={servicePurgeQuery.error}
                     statusPollingError={getPurgeServiceDetailsQuery.error}
diff --git a/src/components/content/deployedServices/reports/Reports.tsx b/src/components/content/deployedServices/reports/Reports.tsx
index 722cce008..3f7bc9286 100644
--- a/src/components/content/deployedServices/reports/Reports.tsx
+++ b/src/components/content/deployedServices/reports/Reports.tsx
@@ -51,7 +51,7 @@ function Reports(): React.JSX.Element {
                 );
             } else if (serviceIdInQuery) {
                 deployedServiceList = listDeployedServicesByIsvQuery.data.filter(
-                    (service) => service.id === serviceIdInQuery
+                    (service) => service.serviceId === serviceIdInQuery
                 );
             } else {
                 deployedServiceList = listDeployedServicesByIsvQuery.data;
@@ -72,11 +72,11 @@ function Reports(): React.JSX.Element {
     const columns: ColumnsType<DeployedService> = [
         {
             title: 'Id',
-            dataIndex: 'id',
+            dataIndex: 'serviceId',
             filters: serviceIdInQuery ? undefined : serviceIdFilters,
             filterMode: 'tree',
             filterSearch: true,
-            onFilter: (value: React.Key | boolean, record) => record.id.startsWith(value.toString()),
+            onFilter: (value: React.Key | boolean, record) => record.serviceId.startsWith(value.toString()),
             filtered: !!serviceIdInQuery,
             align: 'center',
         },
@@ -220,7 +220,7 @@ function Reports(): React.JSX.Element {
         const filters: ColumnFilterItem[] = [];
         const serviceIdSet = new Set<string>('');
         resp.forEach((v) => {
-            serviceIdSet.add(v.id);
+            serviceIdSet.add(v.serviceId);
         });
         serviceIdSet.forEach((id) => {
             const filter = {
@@ -336,7 +336,7 @@ function Reports(): React.JSX.Element {
     }
 
     const handleMyServiceDetailsOpenModal = (deployedService: DeployedService) => {
-        setServiceIdInModal(deployedService.id);
+        setServiceIdInModal(deployedService.serviceId);
         setIsMyServiceDetailsModalOpen(true);
     };
 
diff --git a/src/components/content/monitor/Monitor.tsx b/src/components/content/monitor/Monitor.tsx
index 55b6a90af..2c0ff3996 100644
--- a/src/components/content/monitor/Monitor.tsx
+++ b/src/components/content/monitor/Monitor.tsx
@@ -56,11 +56,11 @@ function Monitor(): React.JSX.Element {
             const serviceVo: DeployedService = location.state as DeployedService;
             form.setFieldsValue({ serviceName: serviceVo.name });
             form.setFieldsValue({ customerServiceName: serviceVo.customerServiceName ?? undefined });
-            form.setFieldsValue({ serviceId: serviceVo.id });
+            form.setFieldsValue({ serviceId: serviceVo.serviceId });
             onFinish({
                 serviceName: serviceVo.name,
                 customerServiceName: serviceVo.customerServiceName ?? '',
-                serviceId: serviceVo.id,
+                serviceId: serviceVo.serviceId,
             });
         }
     }, [form, location.state, onFinish]);
@@ -88,7 +88,7 @@ function Monitor(): React.JSX.Element {
                         value: serviceVo.customerServiceName ?? '',
                         label: serviceVo.customerServiceName ?? '',
                         serviceName: serviceVo.name,
-                        id: serviceVo.id,
+                        id: serviceVo.serviceId,
                     };
                     newCustomerServiceNameList.push(customerServiceName);
                 }
@@ -132,7 +132,7 @@ function Monitor(): React.JSX.Element {
                         value: serviceVo.customerServiceName ?? '',
                         label: serviceVo.customerServiceName ?? '',
                         serviceName: serviceVo.name,
-                        id: serviceVo.id,
+                        id: serviceVo.serviceId,
                     };
                     newCustomerServiceNameList.push(cusServiceName);
                 }
@@ -164,7 +164,7 @@ function Monitor(): React.JSX.Element {
                     value: serviceVo.customerServiceName ?? '',
                     label: serviceVo.customerServiceName ?? '',
                     serviceName: serviceVo.name,
-                    id: serviceVo.id,
+                    id: serviceVo.serviceId,
                 };
                 newCustomerServiceNameList.push(cusServiceName);
             }
diff --git a/src/components/content/order/common/ScaleOrModifySubmitStatusAlert.tsx b/src/components/content/order/common/ScaleOrModifySubmitStatusAlert.tsx
index 491b72c8a..dbadef380 100644
--- a/src/components/content/order/common/ScaleOrModifySubmitStatusAlert.tsx
+++ b/src/components/content/order/common/ScaleOrModifySubmitStatusAlert.tsx
@@ -38,7 +38,7 @@ function ScaleOrModifySubmitStatusAlert({
         autoStart: true,
     });
     const getServiceDetailsByIdQuery = useServiceDetailsPollingQuery(
-        currentSelectedService.id,
+        currentSelectedService.serviceId,
         !isSubmitFailed && !isSubmitInProgress,
         currentSelectedService.serviceHostingType,
         [
@@ -147,7 +147,7 @@ function ScaleOrModifySubmitStatusAlert({
     return (
         <OrderSubmitResult
             msg={msg}
-            uuid={currentSelectedService.id}
+            uuid={currentSelectedService.serviceId}
             type={alertType}
             stopWatch={stopWatch}
             contactServiceDetails={alertType !== 'success' ? serviceProviderContactDetails : undefined}
diff --git a/src/components/content/order/destroy/DestroyServiceStatusAlert.tsx b/src/components/content/order/destroy/DestroyServiceStatusAlert.tsx
index 1b38b23a5..bd04bab7b 100644
--- a/src/components/content/order/destroy/DestroyServiceStatusAlert.tsx
+++ b/src/components/content/order/destroy/DestroyServiceStatusAlert.tsx
@@ -55,7 +55,9 @@ function DestroyServiceStatusAlert({
                 {' '}
                 <Alert
                     message={errorMessage}
-                    description={<OrderSubmitResultDetails msg={'Destroy request failed'} uuid={deployedService.id} />}
+                    description={
+                        <OrderSubmitResultDetails msg={'Destroy request failed'} uuid={deployedService.serviceId} />
+                    }
                     showIcon
                     closable={true}
                     onClose={onClose}
@@ -91,7 +93,7 @@ function DestroyServiceStatusAlert({
                         description={
                             <OrderSubmitResultDetails
                                 msg={'Polling Service Destroy Status Failed'}
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
@@ -131,7 +133,7 @@ function DestroyServiceStatusAlert({
                         description={
                             <OrderSubmitResultDetails
                                 msg={'Service destroyed successfully'}
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
@@ -150,7 +152,9 @@ function DestroyServiceStatusAlert({
                     {' '}
                     <Alert
                         message={'Processing Status'}
-                        description={<OrderSubmitResultDetails msg={'Destroy failed'} uuid={deployedService.id} />}
+                        description={
+                            <OrderSubmitResultDetails msg={'Destroy failed'} uuid={deployedService.serviceId} />
+                        }
                         showIcon
                         closable={true}
                         onClose={onClose}
diff --git a/src/components/content/order/formDataHelpers/deployParamsHelper.ts b/src/components/content/order/formDataHelpers/deployParamsHelper.ts
index 3ad834bb6..121d03873 100644
--- a/src/components/content/order/formDataHelpers/deployParamsHelper.ts
+++ b/src/components/content/order/formDataHelpers/deployParamsHelper.ts
@@ -29,7 +29,7 @@ export const getDeployParams = (
 
     userOrderableServiceVoList.forEach((userOrderableServiceVo) => {
         if (userOrderableServiceVo.csp === selectCsp) {
-            registeredServiceId = userOrderableServiceVo.id;
+            registeredServiceId = userOrderableServiceVo.serviceTemplateId;
             service = userOrderableServiceVo;
         }
     });
diff --git a/src/components/content/order/locks/Locks.tsx b/src/components/content/order/locks/Locks.tsx
index a0dcee054..de08e15fc 100644
--- a/src/components/content/order/locks/Locks.tsx
+++ b/src/components/content/order/locks/Locks.tsx
@@ -21,11 +21,11 @@ export const Locks = ({
 }): React.JSX.Element => {
     const [form] = Form.useForm();
 
-    const lockRequest = useLockRequest(currentSelectedService.id);
+    const lockRequest = useLockRequest(currentSelectedService.serviceId);
 
     const onFinish = (values: { destroyChecked: boolean; modifyChecked: boolean }) => {
         const serviceLockConfig: { id: string; lockConfig: ServiceLockConfig } = {
-            id: currentSelectedService.id,
+            id: currentSelectedService.serviceId,
             lockConfig: {
                 destroyLocked: values.destroyChecked,
                 modifyLocked: values.modifyChecked,
diff --git a/src/components/content/order/locks/LocksResult.tsx b/src/components/content/order/locks/LocksResult.tsx
index 7aedfd5ea..95e0ff5fc 100644
--- a/src/components/content/order/locks/LocksResult.tsx
+++ b/src/components/content/order/locks/LocksResult.tsx
@@ -20,7 +20,7 @@ function LocksResult({
 }: {
     currentSelectedService: DeployedServiceDetails | VendorHostedDeployedServiceDetails;
 }): React.JSX.Element {
-    const lockRequestState = useLockRequestState(currentSelectedService.id);
+    const lockRequestState = useLockRequestState(currentSelectedService.serviceId);
     if (lockRequestState[0]?.status === 'success') {
         return (
             <Alert
diff --git a/src/components/content/order/migrate/MigrateServiceSubmit.tsx b/src/components/content/order/migrate/MigrateServiceSubmit.tsx
index 3ca33704f..423268e25 100644
--- a/src/components/content/order/migrate/MigrateServiceSubmit.tsx
+++ b/src/components/content/order/migrate/MigrateServiceSubmit.tsx
@@ -89,7 +89,7 @@ export const MigrateServiceSubmit = ({
         migrateServiceDetailsQuery.data?.migrationStatus
     );
     const destroyServiceDetailsQuery = useServiceDetailsPollingQuery(
-        currentSelectedService.id,
+        currentSelectedService.serviceId,
         currentSelectedService.serviceHostingType,
         migrateServiceDetailsQuery.data?.migrationStatus
     );
@@ -100,7 +100,7 @@ export const MigrateServiceSubmit = ({
         if (deployParams !== undefined) {
             const migrateRequest: MigrateRequest = deployParams as MigrateRequest;
             migrateRequest.region = region;
-            migrateRequest.id = currentSelectedService.id;
+            migrateRequest.originalServiceId = currentSelectedService.serviceId;
             migrateRequest.billingMode = selectBillingMode;
             migrateServiceRequest.mutate(migrateRequest);
             stepItem.status = 'process';
diff --git a/src/components/content/order/modify/Modify.tsx b/src/components/content/order/modify/Modify.tsx
index c16ee5c1e..c5bf711e9 100644
--- a/src/components/content/order/modify/Modify.tsx
+++ b/src/components/content/order/modify/Modify.tsx
@@ -80,7 +80,7 @@ export const Modify = ({
         }
         createRequest.serviceRequestProperties = serviceRequestProperties as Record<string, never>;
         const modifyServiceRequestParams: ModifySubmitRequest = {
-            id: currentSelectedService.id,
+            id: currentSelectedService.serviceId,
             modifyRequest: createRequest,
         };
 
diff --git a/src/components/content/order/purge/PurgeServiceStatusAlert.tsx b/src/components/content/order/purge/PurgeServiceStatusAlert.tsx
index be46e7484..bcba0b5a2 100644
--- a/src/components/content/order/purge/PurgeServiceStatusAlert.tsx
+++ b/src/components/content/order/purge/PurgeServiceStatusAlert.tsx
@@ -43,7 +43,9 @@ export function PurgeServiceStatusAlert({
                 {' '}
                 <Alert
                     message={errorMessage}
-                    description={<OrderSubmitResultDetails msg={'Purge request failed'} uuid={deployedService.id} />}
+                    description={
+                        <OrderSubmitResultDetails msg={'Purge request failed'} uuid={deployedService.serviceId} />
+                    }
                     showIcon
                     closable={true}
                     onClose={onClose}
@@ -67,7 +69,7 @@ export function PurgeServiceStatusAlert({
         );
     }
 
-    if (deployedService.id && statusPollingError) {
+    if (deployedService.serviceId && statusPollingError) {
         if (statusPollingError instanceof ApiError && statusPollingError.body && 'details' in statusPollingError.body) {
             const response: Response = statusPollingError.body as Response;
             if (response.resultType !== Response.resultType.SERVICE_DEPLOYMENT_NOT_FOUND) {
@@ -78,7 +80,10 @@ export function PurgeServiceStatusAlert({
                         <Alert
                             message={response.details}
                             description={
-                                <OrderSubmitResultDetails msg={'Purge request failed'} uuid={deployedService.id} />
+                                <OrderSubmitResultDetails
+                                    msg={'Purge request failed'}
+                                    uuid={deployedService.serviceId}
+                                />
                             }
                             showIcon
                             closable={true}
@@ -111,7 +116,7 @@ export function PurgeServiceStatusAlert({
                             description={
                                 <OrderSubmitResultDetails
                                     msg={`Service purged successfully`}
-                                    uuid={deployedService.id}
+                                    uuid={deployedService.serviceId}
                                 />
                             }
                             showIcon
diff --git a/src/components/content/order/scale/Scale.tsx b/src/components/content/order/scale/Scale.tsx
index 59d478172..e313d32f1 100644
--- a/src/components/content/order/scale/Scale.tsx
+++ b/src/components/content/order/scale/Scale.tsx
@@ -84,7 +84,7 @@ export const Scale = ({
         }
         createRequest.serviceRequestProperties = serviceRequestProperties as Record<string, never>;
         const modifyServiceRequestParams: ModifySubmitRequest = {
-            id: currentSelectedService.id,
+            id: currentSelectedService.serviceId,
             modifyRequest: createRequest,
         };
 
diff --git a/src/components/content/order/serviceState/restart/RestartServiceStatusAlert.tsx b/src/components/content/order/serviceState/restart/RestartServiceStatusAlert.tsx
index efe92069d..e9c17fcc8 100644
--- a/src/components/content/order/serviceState/restart/RestartServiceStatusAlert.tsx
+++ b/src/components/content/order/serviceState/restart/RestartServiceStatusAlert.tsx
@@ -53,7 +53,9 @@ function RestartServiceStatusAlert({
                 {' '}
                 <Alert
                     message={errorMessage}
-                    description={<OrderSubmitResultDetails msg={'Restart request failed'} uuid={deployedService.id} />}
+                    description={
+                        <OrderSubmitResultDetails msg={'Restart request failed'} uuid={deployedService.serviceId} />
+                    }
                     showIcon
                     closable={true}
                     onClose={onClose}
@@ -91,7 +93,7 @@ function RestartServiceStatusAlert({
                         description={
                             <OrderSubmitResultDetails
                                 msg={'Polling Service restart Status Failed'}
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
@@ -139,7 +141,7 @@ function RestartServiceStatusAlert({
                         description={
                             <OrderSubmitResultDetails
                                 msg={'Service restarted successfully'}
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
@@ -169,7 +171,7 @@ function RestartServiceStatusAlert({
                                         ? getRestartServiceDetailsQuery.data.latestRunningManagementTask.errorMsg.toString()
                                         : 'Restart request failed'
                                 }
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
diff --git a/src/components/content/order/serviceState/restart/useServiceStateRestartQuery.ts b/src/components/content/order/serviceState/restart/useServiceStateRestartQuery.ts
index 2d1affe8d..56eff3c9d 100644
--- a/src/components/content/order/serviceState/restart/useServiceStateRestartQuery.ts
+++ b/src/components/content/order/serviceState/restart/useServiceStateRestartQuery.ts
@@ -9,7 +9,7 @@ import { DeployedService, ServiceStatusManagementService } from '../../../../../
 export function useServiceStateRestartQuery(refreshData: () => void) {
     return useMutation({
         mutationFn: (deployedService: DeployedService) => {
-            return ServiceStatusManagementService.restartService(deployedService.id);
+            return ServiceStatusManagementService.restartService(deployedService.serviceId);
         },
         onSuccess: refreshData,
     });
diff --git a/src/components/content/order/serviceState/start/StartServiceStatusAlert.tsx b/src/components/content/order/serviceState/start/StartServiceStatusAlert.tsx
index 94cc643cb..b652dcd6e 100644
--- a/src/components/content/order/serviceState/start/StartServiceStatusAlert.tsx
+++ b/src/components/content/order/serviceState/start/StartServiceStatusAlert.tsx
@@ -54,7 +54,9 @@ function StartServiceStatusAlert({
                 {' '}
                 <Alert
                     message={errorMessage}
-                    description={<OrderSubmitResultDetails msg={'Start request failed'} uuid={deployedService.id} />}
+                    description={
+                        <OrderSubmitResultDetails msg={'Start request failed'} uuid={deployedService.serviceId} />
+                    }
                     showIcon
                     closable={true}
                     onClose={onClose}
@@ -92,7 +94,7 @@ function StartServiceStatusAlert({
                         description={
                             <OrderSubmitResultDetails
                                 msg={'Polling Service start Status Failed'}
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
@@ -138,7 +140,10 @@ function StartServiceStatusAlert({
                             getStartServiceDetailsQuery.data.latestRunningManagementTask.taskStatus
                         }
                         description={
-                            <OrderSubmitResultDetails msg={'Service started successfully'} uuid={deployedService.id} />
+                            <OrderSubmitResultDetails
+                                msg={'Service started successfully'}
+                                uuid={deployedService.serviceId}
+                            />
                         }
                         showIcon
                         closable={true}
@@ -167,7 +172,7 @@ function StartServiceStatusAlert({
                                         ? getStartServiceDetailsQuery.data.latestRunningManagementTask.errorMsg.toString()
                                         : 'Start failed'
                                 }
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
diff --git a/src/components/content/order/serviceState/start/useServiceStateStartQuery.ts b/src/components/content/order/serviceState/start/useServiceStateStartQuery.ts
index 745f551aa..83b85c142 100644
--- a/src/components/content/order/serviceState/start/useServiceStateStartQuery.ts
+++ b/src/components/content/order/serviceState/start/useServiceStateStartQuery.ts
@@ -9,7 +9,7 @@ import { DeployedService, ServiceStatusManagementService } from '../../../../../
 export function useServiceStateStartQuery(refreshData: () => void) {
     return useMutation({
         mutationFn: (deployedService: DeployedService) => {
-            return ServiceStatusManagementService.startService(deployedService.id);
+            return ServiceStatusManagementService.startService(deployedService.serviceId);
         },
         onSuccess: refreshData,
     });
diff --git a/src/components/content/order/serviceState/stop/StopServiceStatusAlert.tsx b/src/components/content/order/serviceState/stop/StopServiceStatusAlert.tsx
index 8730eb37a..7c05609d4 100644
--- a/src/components/content/order/serviceState/stop/StopServiceStatusAlert.tsx
+++ b/src/components/content/order/serviceState/stop/StopServiceStatusAlert.tsx
@@ -55,7 +55,10 @@ function StopServiceStatusAlert({
                 <Alert
                     message={errorMessage}
                     description={
-                        <OrderSubmitResultDetails msg={'Service stop request failed'} uuid={deployedService.id} />
+                        <OrderSubmitResultDetails
+                            msg={'Service stop request failed'}
+                            uuid={deployedService.serviceId}
+                        />
                     }
                     showIcon
                     closable={true}
@@ -94,7 +97,7 @@ function StopServiceStatusAlert({
                         description={
                             <OrderSubmitResultDetails
                                 msg={'Polling Service Stop Status Failed'}
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
@@ -140,7 +143,10 @@ function StopServiceStatusAlert({
                             getStopServiceDetailsQuery.data.latestRunningManagementTask.taskStatus
                         }
                         description={
-                            <OrderSubmitResultDetails msg={'Service stopped successfully'} uuid={deployedService.id} />
+                            <OrderSubmitResultDetails
+                                msg={'Service stopped successfully'}
+                                uuid={deployedService.serviceId}
+                            />
                         }
                         showIcon
                         closable={true}
@@ -169,7 +175,7 @@ function StopServiceStatusAlert({
                                         ? getStopServiceDetailsQuery.data.latestRunningManagementTask.errorMsg.toString()
                                         : 'Stop failed'
                                 }
-                                uuid={deployedService.id}
+                                uuid={deployedService.serviceId}
                             />
                         }
                         showIcon
diff --git a/src/components/content/order/serviceState/stop/useServiceStateStopQuery.ts b/src/components/content/order/serviceState/stop/useServiceStateStopQuery.ts
index cf74a9d89..ed80a8cf4 100644
--- a/src/components/content/order/serviceState/stop/useServiceStateStopQuery.ts
+++ b/src/components/content/order/serviceState/stop/useServiceStateStopQuery.ts
@@ -9,7 +9,7 @@ import { DeployedService, ServiceStatusManagementService } from '../../../../../
 export function useServiceStateStopQuery(refreshData: () => void) {
     return useMutation({
         mutationFn: (deployedService: DeployedService) => {
-            return ServiceStatusManagementService.stopService(deployedService.id);
+            return ServiceStatusManagementService.stopService(deployedService.serviceId);
         },
         onSuccess: refreshData,
     });
diff --git a/src/components/content/policies/AddOrUpdatePolicy.tsx b/src/components/content/policies/AddOrUpdatePolicy.tsx
index 74f0835e2..ca077fbaf 100644
--- a/src/components/content/policies/AddOrUpdatePolicy.tsx
+++ b/src/components/content/policies/AddOrUpdatePolicy.tsx
@@ -52,7 +52,7 @@ export const AddOrUpdatePolicy = ({
             policyCreateRequest.policy = policyRequest.policy;
             setCreatePolicyRequest(policyCreateRequest);
             createPoliciesManagementServiceRequest.mutate(policyCreateRequest);
-        } else if (currentPolicyService.id.length > 0) {
+        } else if (currentPolicyService.userPolicyId.length > 0) {
             if (comparePolicyUpdateRequestResult(policyRequest)) {
                 setIsUpdated(comparePolicyUpdateRequestResult(policyRequest));
                 return;
@@ -63,7 +63,7 @@ export const AddOrUpdatePolicy = ({
             policyUpdateRequest.policy = policyRequest.policy;
             setUpdatePolicyRequest(policyUpdateRequest);
             updatePoliciesManagementServiceRequest.mutate({
-                id: currentPolicyService.id,
+                id: currentPolicyService.userPolicyId,
                 requestBody: policyUpdateRequest,
             });
         }
@@ -209,11 +209,11 @@ export const AddOrUpdatePolicy = ({
                 initialValues={{
                     remember: true,
                     csp:
-                        currentPolicyService !== undefined && currentPolicyService.id.length > 0
+                        currentPolicyService !== undefined && currentPolicyService.userPolicyId.length > 0
                             ? currentPolicyService.csp
                             : undefined,
                     enabled:
-                        currentPolicyService !== undefined && currentPolicyService.id.length > 0
+                        currentPolicyService !== undefined && currentPolicyService.userPolicyId.length > 0
                             ? currentPolicyService.enabled
                             : false,
                     policy: policyContent.current,
diff --git a/src/components/content/policies/Policies.tsx b/src/components/content/policies/Policies.tsx
index a8f948575..3f7973a3f 100644
--- a/src/components/content/policies/Policies.tsx
+++ b/src/components/content/policies/Policies.tsx
@@ -40,7 +40,7 @@ function Policies(): React.JSX.Element {
     const columns: ColumnsType<UserPolicy> = [
         {
             title: 'Policy ID',
-            dataIndex: 'id',
+            dataIndex: 'userPolicyId',
         },
         {
             title: 'CSP',
@@ -138,7 +138,7 @@ function Policies(): React.JSX.Element {
                                     type='primary'
                                     icon={<CloseCircleOutlined />}
                                     loading={
-                                        record.id === id &&
+                                        record.userPolicyId === id &&
                                         !deletePoliciesManagementServiceRequest.isSuccess &&
                                         deletePoliciesManagementServiceRequest.isError
                                     }
@@ -160,8 +160,8 @@ function Policies(): React.JSX.Element {
     ];
 
     const deleteCurrentPolicy = (record: UserPolicy) => {
-        setId(record.id);
-        deletePoliciesManagementServiceRequest.mutate(record.id);
+        setId(record.userPolicyId);
+        deletePoliciesManagementServiceRequest.mutate(record.userPolicyId);
     };
 
     const getDeleteCloseStatus = (isClose: boolean) => {
diff --git a/src/components/content/policies/add/PolicyCreateResultStatus.tsx b/src/components/content/policies/add/PolicyCreateResultStatus.tsx
index f407e63a9..f059c2ab0 100644
--- a/src/components/content/policies/add/PolicyCreateResultStatus.tsx
+++ b/src/components/content/policies/add/PolicyCreateResultStatus.tsx
@@ -62,7 +62,7 @@ export default function PolicyCreateResultStatus({
                     description={
                         <PolicySubmitResultDetails
                             msg={'Policy created successfully'}
-                            uuid={currentPolicyService === undefined ? '' : currentPolicyService.id}
+                            uuid={currentPolicyService === undefined ? '' : currentPolicyService.userPolicyId}
                         />
                     }
                     showIcon
diff --git a/src/components/content/policies/update/PolicyUpdateResultStatus.tsx b/src/components/content/policies/update/PolicyUpdateResultStatus.tsx
index 122b584d3..44bbef034 100644
--- a/src/components/content/policies/update/PolicyUpdateResultStatus.tsx
+++ b/src/components/content/policies/update/PolicyUpdateResultStatus.tsx
@@ -60,7 +60,7 @@ export default function PolicyUpdateResultStatus({
                     description={
                         <PolicySubmitResultDetails
                             msg={'Policy updated successfully'}
-                            uuid={currentPolicyService === undefined ? '' : currentPolicyService.id}
+                            uuid={currentPolicyService === undefined ? '' : currentPolicyService.userPolicyId}
                         />
                     }
                     showIcon
diff --git a/src/components/content/register/RegisterPanel.tsx b/src/components/content/register/RegisterPanel.tsx
index f637eacaf..2f68c7a52 100644
--- a/src/components/content/register/RegisterPanel.tsx
+++ b/src/components/content/register/RegisterPanel.tsx
@@ -43,9 +43,9 @@ function RegisterPanel(): React.JSX.Element {
         },
         onSuccess: (serviceTemplateVo: ServiceTemplateDetailVo) => {
             files.current[0].status = 'done';
-            registerResult.current = [`ID - ${serviceTemplateVo.id}`];
+            registerResult.current = [`ID - ${serviceTemplateVo.serviceTemplateId}`];
             void queryClient.refetchQueries({ queryKey: getQueryKey(serviceTemplateVo.category) });
-            navigate(registerSuccessfulRoute.concat(`?id=${serviceTemplateVo.id}`));
+            navigate(registerSuccessfulRoute.concat(`?id=${serviceTemplateVo.serviceTemplateId}`));
         },
         onError: (error: Error) => {
             files.current[0].status = 'error';
diff --git a/src/components/content/review/ApproveOrRejectServiceTemplate.tsx b/src/components/content/review/ApproveOrRejectServiceTemplate.tsx
index 44dca488c..7208e652d 100644
--- a/src/components/content/review/ApproveOrRejectServiceTemplate.tsx
+++ b/src/components/content/review/ApproveOrRejectServiceTemplate.tsx
@@ -24,11 +24,11 @@ export const ApproveOrRejectServiceTemplate = ({
 }): React.JSX.Element => {
     const { TextArea } = Input;
     const [comments, setComments] = useState<string>('');
-    const approveOrRejectRequest = useApproveOrRejectRequest(currentServiceTemplateVo.id);
+    const approveOrRejectRequest = useApproveOrRejectRequest(currentServiceTemplateVo.serviceTemplateId);
     const handleOk = () => {
         if (isApproved !== undefined) {
             const request: ApproveOrRejectRequestParams = {
-                id: currentServiceTemplateVo.id,
+                id: currentServiceTemplateVo.serviceTemplateId,
                 reviewRegistrationRequest: {
                     reviewResult: isApproved
                         ? ReviewRegistrationRequest.reviewResult.APPROVED
diff --git a/src/components/content/review/ServiceReviews.tsx b/src/components/content/review/ServiceReviews.tsx
index f2cb4493a..9853c0e04 100644
--- a/src/components/content/review/ServiceReviews.tsx
+++ b/src/components/content/review/ServiceReviews.tsx
@@ -132,7 +132,7 @@ export default function ServiceReviews(): React.JSX.Element {
     const columns: ColumnsType<ServiceTemplateDetailVo> = [
         {
             title: 'Service Template Id',
-            dataIndex: 'id',
+            dataIndex: 'serviceTemplateId',
             filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => (
                 <div className={serviceReviewStyles.searchContainerClass}>
                     <Input
@@ -170,8 +170,8 @@ export default function ServiceReviews(): React.JSX.Element {
             ),
             filterIcon: (filtered: boolean) => <SearchOutlined style={{ color: filtered ? '#1677ff' : undefined }} />,
             onFilter: (value: React.Key | boolean, record) => {
-                if (record.id) {
-                    return record.id.toString().toLowerCase().includes(value.toString().toLowerCase());
+                if (record.serviceTemplateId) {
+                    return record.serviceTemplateId.toString().toLowerCase().includes(value.toString().toLowerCase());
                 }
                 return false;
             },
diff --git a/src/components/content/review/ServiceReviewsDetails.tsx b/src/components/content/review/ServiceReviewsDetails.tsx
index 0d469e88d..0df7052ec 100644
--- a/src/components/content/review/ServiceReviewsDetails.tsx
+++ b/src/components/content/review/ServiceReviewsDetails.tsx
@@ -29,8 +29,8 @@ export const ServiceReviewsDetails = ({
     const PLACE_HOLDER_UNKNOWN_VALUE: string = 'NOT PROVIDED';
     const [isReviewCommentsModalOpen, setIsReviewCommentsModalOpen] = useState<boolean>(false);
     const [isApproved, setIsApproved] = useState<boolean | undefined>(undefined);
-    const getRegistrationDetailsQuery = useGetRegistrationDetails(currentServiceTemplateVo.id);
-    const useReviewRequestState = useApproveOrRejectMutationState(currentServiceTemplateVo.id);
+    const getRegistrationDetailsQuery = useGetRegistrationDetails(currentServiceTemplateVo.serviceTemplateId);
+    const useReviewRequestState = useApproveOrRejectMutationState(currentServiceTemplateVo.serviceTemplateId);
     const { Paragraph } = Typography;
 
     const onClickApprove = () => {
@@ -75,7 +75,7 @@ export const ServiceReviewsDetails = ({
                 Reject
             </Button>
             <ApproveOrRejectServiceTemplate
-                key={currentServiceTemplateVo.id}
+                key={currentServiceTemplateVo.serviceTemplateId}
                 currentServiceTemplateVo={currentServiceTemplateVo}
                 isApproved={isApproved}
                 isModalOpen={isReviewCommentsModalOpen}
@@ -156,7 +156,9 @@ export const ServiceReviewsDetails = ({
                         bordered
                         className={oclDisplayStyles.oclDataInfoTable}
                     >
-                        <Descriptions.Item label='Service Template Id'>{currentServiceTemplateVo.id}</Descriptions.Item>
+                        <Descriptions.Item label='Service Template Id'>
+                            {currentServiceTemplateVo.serviceTemplateId}
+                        </Descriptions.Item>
                         <Descriptions.Item label='Category'>
                             {/* eslint-disable-next-line @typescript-eslint/no-unnecessary-condition */}
                             {currentServiceTemplateVo.category
diff --git a/src/xpanse-api/api.json b/src/xpanse-api/api.json
index c2ab6ff28..ad1ee416c 100644
--- a/src/xpanse-api/api.json
+++ b/src/xpanse-api/api.json
@@ -3,7 +3,7 @@
     "info": {
         "title": "XpanseAPI",
         "description": "RESTful Services to interact with Xpanse runtime.",
-        "version": "1.0.16-SNAPSHOT"
+        "version": "1.0.17-SNAPSHOT"
     },
     "servers": [{ "url": "http://localhost:8080", "description": "Generated server url" }],
     "security": [{ "OAuth2Flow": [] }],
@@ -37,7 +37,6 @@
             "name": "UserCloudCredentialsManagement",
             "description": "APIs for managing user's cloud provider credentials"
         },
-        { "name": "ServiceModification", "description": "APIs to manage modifications of the service instances." },
         { "name": "Monitor", "description": "APIs for getting metrics of deployed services." }
     ],
     "paths": {
@@ -63,16 +62,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -83,6 +78,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -114,16 +113,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -134,6 +129,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -179,16 +178,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -199,6 +194,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -227,16 +226,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -247,6 +242,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -265,16 +264,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -285,6 +280,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -335,16 +334,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -355,6 +350,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -370,16 +369,12 @@
                 "operationId": "stopService",
                 "parameters": [{ "name": "serviceId", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -390,6 +385,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -408,16 +407,12 @@
                 "operationId": "startService",
                 "parameters": [{ "name": "serviceId", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -428,6 +423,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -446,16 +445,12 @@
                 "operationId": "restartService",
                 "parameters": [{ "name": "serviceId", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -466,6 +461,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -496,16 +495,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -516,6 +511,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -548,16 +547,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -568,6 +563,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -591,16 +590,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -611,6 +606,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -641,16 +640,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -661,6 +656,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -687,16 +686,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -707,6 +702,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -730,16 +729,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -750,6 +745,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -784,16 +783,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -804,6 +799,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -827,16 +826,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -847,6 +842,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -882,16 +881,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -902,6 +897,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -922,16 +921,12 @@
                 "operationId": "getServicePolicyDetails",
                 "parameters": [{ "name": "id", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -942,6 +937,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -974,16 +973,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -994,6 +989,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1012,16 +1011,12 @@
                 "operationId": "deleteServicePolicy",
                 "parameters": [{ "name": "id", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1032,6 +1027,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1047,16 +1046,12 @@
                 "operationId": "getPolicyDetails",
                 "parameters": [{ "name": "id", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1067,6 +1062,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1097,16 +1096,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1117,6 +1112,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1133,16 +1132,12 @@
                 "operationId": "deleteUserPolicy",
                 "parameters": [{ "name": "id", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1153,6 +1148,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1198,16 +1197,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1218,6 +1213,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1246,16 +1245,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1266,6 +1261,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1284,16 +1283,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1304,6 +1299,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1354,16 +1353,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1374,6 +1369,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1466,16 +1465,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1486,6 +1481,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1512,16 +1511,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1532,6 +1527,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1553,16 +1552,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1573,6 +1568,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1667,16 +1666,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1687,6 +1682,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1712,17 +1711,13 @@
                     "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Ocl" } } },
                     "required": true
                 },
-                "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
+                "responses": {
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1733,6 +1728,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1761,16 +1760,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1781,6 +1776,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1809,16 +1808,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1829,6 +1824,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1854,16 +1853,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1874,6 +1869,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1921,16 +1920,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1941,6 +1936,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -1966,16 +1965,12 @@
                     "required": true
                 },
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -1986,6 +1981,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2012,16 +2011,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2032,6 +2027,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2076,16 +2075,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2096,6 +2091,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2127,16 +2126,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2147,6 +2142,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2158,7 +2157,7 @@
         "/xpanse/services/{serviceId}/modifications": {
             "get": {
                 "tags": ["ServiceModification"],
-                "description": "List modification audits of the service instance.<br>Required role:<b> admin</b> or <b>user</b>",
+                "description": "List modification audits of the service instance<br>Required role:<b> admin</b> or <b>user</b>",
                 "operationId": "listServiceModificationAudits",
                 "parameters": [
                     {
@@ -2177,16 +2176,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2197,6 +2192,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2228,16 +2227,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2248,6 +2243,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2271,16 +2270,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2291,6 +2286,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2319,16 +2318,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2339,6 +2334,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2362,16 +2361,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2382,6 +2377,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2410,16 +2409,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2430,6 +2425,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2493,16 +2492,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2513,6 +2508,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2546,16 +2545,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2566,6 +2561,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2663,16 +2662,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2683,6 +2678,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2716,16 +2715,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2736,6 +2731,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2833,16 +2832,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2853,6 +2848,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2886,16 +2885,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2906,6 +2901,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -2933,19 +2932,15 @@
                         "description": "Task id of deployed service",
                         "required": true,
                         "schema": { "type": "string" }
-                    }
-                ],
-                "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
+                    }
+                ],
+                "responses": {
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -2956,6 +2951,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3005,16 +3004,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3025,6 +3020,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3067,16 +3066,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3087,6 +3082,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3165,16 +3164,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3185,6 +3180,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3206,16 +3205,12 @@
                 "description": "Check health of API service and backend systems.<br>Required role:<b> admin</b> or <b>csp</b> or <b>isv</b> or <b>user</b>",
                 "operationId": "healthCheck",
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3226,6 +3221,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3243,16 +3242,12 @@
                 "description": "List cloud service providers with active plugin.<br>Required role:<b> admin</b> or <b>csp</b> or <b>isv</b> or <b>user</b>",
                 "operationId": "getActiveCsps",
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3263,6 +3258,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3357,16 +3356,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3377,6 +3372,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3410,16 +3409,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3430,6 +3425,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3498,16 +3497,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3518,6 +3513,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3565,16 +3564,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3585,6 +3580,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3635,16 +3634,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3655,6 +3650,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3710,16 +3709,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3730,6 +3725,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3775,16 +3774,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3795,6 +3790,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3889,16 +3888,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3909,6 +3904,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3948,16 +3947,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -3968,6 +3963,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -3988,16 +3987,12 @@
                 "operationId": "openApi",
                 "parameters": [{ "name": "id", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -4008,6 +4003,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -4041,16 +4040,12 @@
                     }
                 ],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -4061,6 +4056,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -4080,16 +4079,12 @@
                 "description": "Get and redirect authorization url for user to authenticate.",
                 "operationId": "authorize",
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -4100,6 +4095,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -4115,16 +4114,12 @@
                 "operationId": "destroy",
                 "parameters": [{ "name": "id", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -4135,6 +4130,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -4153,16 +4152,12 @@
                 "operationId": "purge",
                 "parameters": [{ "name": "id", "in": "path", "required": true, "schema": { "type": "string" } }],
                 "responses": {
-                    "400": {
-                        "description": "Bad Request",
-                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "400": {
+                        "description": "Bad Request",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
                     "422": {
@@ -4173,6 +4168,10 @@
                         "description": "Forbidden",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": { "application/json": { "schema": { "$ref": "#/components/schemas/Response" } } }
@@ -4756,7 +4755,6 @@
                     "description",
                     "flavors",
                     "icon",
-                    "id",
                     "lastModifiedTime",
                     "name",
                     "namespace",
@@ -4764,12 +4762,17 @@
                     "serviceHostingType",
                     "serviceProviderContactDetails",
                     "serviceRegistrationState",
+                    "serviceTemplateId",
                     "variables",
                     "version"
                 ],
                 "type": "object",
                 "properties": {
-                    "id": { "type": "string", "description": "ID of the registered service.", "format": "uuid" },
+                    "serviceTemplateId": {
+                        "type": "string",
+                        "description": "ID of the registered service.",
+                        "format": "uuid"
+                    },
                     "name": { "type": "string", "description": "Name of the registered service." },
                     "version": { "type": "string", "description": "Version of the registered service." },
                     "csp": {
@@ -4869,10 +4872,17 @@
                 }
             },
             "ServicePolicy": {
-                "required": ["createTime", "enabled", "id", "lastModifiedTime", "policy", "serviceTemplateId"],
+                "required": [
+                    "createTime",
+                    "enabled",
+                    "lastModifiedTime",
+                    "policy",
+                    "servicePolicyId",
+                    "serviceTemplateId"
+                ],
                 "type": "object",
                 "properties": {
-                    "id": { "type": "string", "description": "The id of the policy.", "format": "uuid" },
+                    "servicePolicyId": { "type": "string", "description": "The id of the policy.", "format": "uuid" },
                     "policy": { "type": "string", "description": "The valid policy belongs to the service." },
                     "serviceTemplateId": {
                         "type": "string",
@@ -4916,10 +4926,10 @@
                 }
             },
             "UserPolicy": {
-                "required": ["createTime", "csp", "enabled", "id", "lastModifiedTime", "policy"],
+                "required": ["createTime", "csp", "enabled", "lastModifiedTime", "policy", "userPolicyId"],
                 "type": "object",
                 "properties": {
-                    "id": { "type": "string", "description": "The id of the policy.", "format": "uuid" },
+                    "userPolicyId": { "type": "string", "description": "The id of the policy.", "format": "uuid" },
                     "policy": { "type": "string", "description": "The valid policy created by the user." },
                     "csp": {
                         "type": "string",
@@ -5013,7 +5023,7 @@
                     "category",
                     "csp",
                     "flavor",
-                    "id",
+                    "originalServiceId",
                     "region",
                     "serviceHostingType",
                     "serviceName",
@@ -5073,7 +5083,11 @@
                         "description": "The billing mode of the managed service.",
                         "enum": ["Fixed", "Pay per Use"]
                     },
-                    "id": { "type": "string", "description": "The id of the service to migrate", "format": "uuid" },
+                    "originalServiceId": {
+                        "type": "string",
+                        "description": "The id of the service to migrate",
+                        "format": "uuid"
+                    },
                     "eulaAccepted": { "type": "boolean" }
                 }
             },
@@ -5255,17 +5269,17 @@
                     "category",
                     "createTime",
                     "csp",
-                    "id",
                     "lastModifiedTime",
                     "name",
                     "serviceDeploymentState",
                     "serviceHostingType",
+                    "serviceId",
                     "serviceState",
                     "version"
                 ],
                 "type": "object",
                 "properties": {
-                    "id": { "type": "string", "description": "The ID of the service", "format": "uuid" },
+                    "serviceId": { "type": "string", "description": "The ID of the service", "format": "uuid" },
                     "category": {
                         "type": "string",
                         "description": "The catalog of the service",
@@ -5353,10 +5367,16 @@
                 }
             },
             "ServiceModificationAuditDetails": {
-                "required": ["id", "newDeployRequest", "previousDeployRequest", "serviceId", "taskStatus"],
+                "required": [
+                    "newDeployRequest",
+                    "previousDeployRequest",
+                    "serviceId",
+                    "serviceModificationRequestId",
+                    "taskStatus"
+                ],
                 "type": "object",
                 "properties": {
-                    "id": {
+                    "serviceModificationRequestId": {
                         "type": "string",
                         "description": "The id of the service modification request.",
                         "format": "uuid"
@@ -5503,17 +5523,17 @@
                     "createTime",
                     "csp",
                     "deployRequest",
-                    "id",
                     "lastModifiedTime",
                     "name",
                     "serviceDeploymentState",
                     "serviceHostingType",
+                    "serviceId",
                     "serviceState",
                     "version"
                 ],
                 "type": "object",
                 "properties": {
-                    "id": { "type": "string", "description": "The ID of the service", "format": "uuid" },
+                    "serviceId": { "type": "string", "description": "The ID of the service", "format": "uuid" },
                     "category": {
                         "type": "string",
                         "description": "The catalog of the service",
@@ -5621,17 +5641,17 @@
                     "createTime",
                     "csp",
                     "deployRequest",
-                    "id",
                     "lastModifiedTime",
                     "name",
                     "serviceDeploymentState",
                     "serviceHostingType",
+                    "serviceId",
                     "serviceState",
                     "version"
                 ],
                 "type": "object",
                 "properties": {
-                    "id": { "type": "string", "description": "The ID of the service", "format": "uuid" },
+                    "serviceId": { "type": "string", "description": "The ID of the service", "format": "uuid" },
                     "category": {
                         "type": "string",
                         "description": "The catalog of the service",
@@ -5807,11 +5827,11 @@
                         "type": "string",
                         "description": "The type of backend system.",
                         "enum": [
-                            "IdentityProvider",
+                            "Identity Provider",
                             "Database",
                             "Terraform Boot",
                             "Tofu Maker",
-                            "PolicyMan",
+                            "Policy Man",
                             "OpenTelemetry Collector"
                         ]
                     },
@@ -5883,17 +5903,21 @@
                     "description",
                     "flavors",
                     "icon",
-                    "id",
                     "name",
                     "regions",
                     "serviceHostingType",
                     "serviceProviderContactDetails",
+                    "serviceTemplateId",
                     "variables",
                     "version"
                 ],
                 "type": "object",
                 "properties": {
-                    "id": { "type": "string", "description": "The id of the orderable service.", "format": "uuid" },
+                    "serviceTemplateId": {
+                        "type": "string",
+                        "description": "The id of the orderable service.",
+                        "format": "uuid"
+                    },
                     "category": {
                         "type": "string",
                         "description": "The category of the orderable service.",
diff --git a/src/xpanse-api/generated/core/OpenAPI.ts b/src/xpanse-api/generated/core/OpenAPI.ts
index 94cdfab35..1b54d5329 100644
--- a/src/xpanse-api/generated/core/OpenAPI.ts
+++ b/src/xpanse-api/generated/core/OpenAPI.ts
@@ -26,7 +26,7 @@ export type OpenAPIConfig = {
 
 export const OpenAPI: OpenAPIConfig = {
     BASE: 'http://localhost:8080',
-    VERSION: '1.0.16-SNAPSHOT',
+    VERSION: '1.0.17-SNAPSHOT',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',
     TOKEN: undefined,
diff --git a/src/xpanse-api/generated/models/BackendSystemStatus.ts b/src/xpanse-api/generated/models/BackendSystemStatus.ts
index b32a36d77..cc5f29d4a 100644
--- a/src/xpanse-api/generated/models/BackendSystemStatus.ts
+++ b/src/xpanse-api/generated/models/BackendSystemStatus.ts
@@ -37,11 +37,11 @@ export namespace BackendSystemStatus {
      * The type of backend system.
      */
     export enum backendSystemType {
-        IDENTITY_PROVIDER = 'IdentityProvider',
+        IDENTITY_PROVIDER = 'Identity Provider',
         DATABASE = 'Database',
         TERRAFORM_BOOT = 'Terraform Boot',
         TOFU_MAKER = 'Tofu Maker',
-        POLICY_MAN = 'PolicyMan',
+        POLICY_MAN = 'Policy Man',
         OPEN_TELEMETRY_COLLECTOR = 'OpenTelemetry Collector',
     }
     /**
diff --git a/src/xpanse-api/generated/models/DeployedService.ts b/src/xpanse-api/generated/models/DeployedService.ts
index aa315be63..c222b1e5a 100644
--- a/src/xpanse-api/generated/models/DeployedService.ts
+++ b/src/xpanse-api/generated/models/DeployedService.ts
@@ -14,7 +14,7 @@ export type DeployedService = {
     /**
      * The ID of the service
      */
-    id: string;
+    serviceId: string;
     /**
      * The catalog of the service
      */
diff --git a/src/xpanse-api/generated/models/DeployedServiceDetails.ts b/src/xpanse-api/generated/models/DeployedServiceDetails.ts
index 9032778b7..a117937e1 100644
--- a/src/xpanse-api/generated/models/DeployedServiceDetails.ts
+++ b/src/xpanse-api/generated/models/DeployedServiceDetails.ts
@@ -16,7 +16,7 @@ export type DeployedServiceDetails = {
     /**
      * The ID of the service
      */
-    id: string;
+    serviceId: string;
     /**
      * The catalog of the service
      */
diff --git a/src/xpanse-api/generated/models/MigrateRequest.ts b/src/xpanse-api/generated/models/MigrateRequest.ts
index 1edfa9b82..cc2476391 100644
--- a/src/xpanse-api/generated/models/MigrateRequest.ts
+++ b/src/xpanse-api/generated/models/MigrateRequest.ts
@@ -53,7 +53,7 @@ export type MigrateRequest = {
     /**
      * The id of the service to migrate
      */
-    id: string;
+    originalServiceId: string;
     eulaAccepted?: boolean;
 };
 export namespace MigrateRequest {
diff --git a/src/xpanse-api/generated/models/ServiceModificationAuditDetails.ts b/src/xpanse-api/generated/models/ServiceModificationAuditDetails.ts
index 38e741ae2..00926ea1c 100644
--- a/src/xpanse-api/generated/models/ServiceModificationAuditDetails.ts
+++ b/src/xpanse-api/generated/models/ServiceModificationAuditDetails.ts
@@ -16,7 +16,7 @@ export type ServiceModificationAuditDetails = {
     /**
      * The id of the service modification request.
      */
-    id: string;
+    serviceModificationRequestId: string;
     /**
      * The id of the deployed service.
      */
diff --git a/src/xpanse-api/generated/models/ServicePolicy.ts b/src/xpanse-api/generated/models/ServicePolicy.ts
index 187fe0a0b..7d51c97f6 100644
--- a/src/xpanse-api/generated/models/ServicePolicy.ts
+++ b/src/xpanse-api/generated/models/ServicePolicy.ts
@@ -11,7 +11,7 @@ export type ServicePolicy = {
     /**
      * The id of the policy.
      */
-    id: string;
+    servicePolicyId: string;
     /**
      * The valid policy belongs to the service.
      */
diff --git a/src/xpanse-api/generated/models/ServiceTemplateDetailVo.ts b/src/xpanse-api/generated/models/ServiceTemplateDetailVo.ts
index faec101d8..00f78839d 100644
--- a/src/xpanse-api/generated/models/ServiceTemplateDetailVo.ts
+++ b/src/xpanse-api/generated/models/ServiceTemplateDetailVo.ts
@@ -18,7 +18,7 @@ export type ServiceTemplateDetailVo = {
     /**
      * ID of the registered service.
      */
-    id: string;
+    serviceTemplateId: string;
     /**
      * Name of the registered service.
      */
diff --git a/src/xpanse-api/generated/models/UserOrderableServiceVo.ts b/src/xpanse-api/generated/models/UserOrderableServiceVo.ts
index 44e0d4f8a..d67e0b408 100644
--- a/src/xpanse-api/generated/models/UserOrderableServiceVo.ts
+++ b/src/xpanse-api/generated/models/UserOrderableServiceVo.ts
@@ -18,7 +18,7 @@ export type UserOrderableServiceVo = {
     /**
      * The id of the orderable service.
      */
-    id: string;
+    serviceTemplateId: string;
     /**
      * The category of the orderable service.
      */
diff --git a/src/xpanse-api/generated/models/UserPolicy.ts b/src/xpanse-api/generated/models/UserPolicy.ts
index 88ce08af7..ba6922c44 100644
--- a/src/xpanse-api/generated/models/UserPolicy.ts
+++ b/src/xpanse-api/generated/models/UserPolicy.ts
@@ -11,7 +11,7 @@ export type UserPolicy = {
     /**
      * The id of the policy.
      */
-    id: string;
+    userPolicyId: string;
     /**
      * The valid policy created by the user.
      */
diff --git a/src/xpanse-api/generated/models/VendorHostedDeployedServiceDetails.ts b/src/xpanse-api/generated/models/VendorHostedDeployedServiceDetails.ts
index 0753c8029..642977f26 100644
--- a/src/xpanse-api/generated/models/VendorHostedDeployedServiceDetails.ts
+++ b/src/xpanse-api/generated/models/VendorHostedDeployedServiceDetails.ts
@@ -15,7 +15,7 @@ export type VendorHostedDeployedServiceDetails = {
     /**
      * The ID of the service
      */
-    id: string;
+    serviceId: string;
     /**
      * The catalog of the service
      */
diff --git a/src/xpanse-api/generated/services/ServiceModificationService.ts b/src/xpanse-api/generated/services/ServiceModificationService.ts
index 33707b50a..ff7591c29 100644
--- a/src/xpanse-api/generated/services/ServiceModificationService.ts
+++ b/src/xpanse-api/generated/services/ServiceModificationService.ts
@@ -40,7 +40,7 @@ export class ServiceModificationService {
         });
     }
     /**
-     * List modification audits of the service instance.<br>Required role:<b> admin</b> or <b>user</b>
+     * List modification audits of the service instance<br>Required role:<b> admin</b> or <b>user</b>
      * @param serviceId id of the service
      * @param taskStatus status of the modification
      * @returns ServiceModificationAuditDetails OK