diff --git a/package-lock.json b/package-lock.json
index 55e7fad0f..c702f7538 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
             "dependencies": {
                 "@ant-design/icons": "^5.5.2",
                 "@axa-fr/react-oidc": "^7.23.1",
-                "@tanstack/react-query": "^5.62.1",
+                "@tanstack/react-query": "^5.62.3",
                 "antd": "^5.22.3",
                 "echarts": "5.5.1",
                 "echarts-for-react": "^3.0.2",
@@ -19,7 +19,7 @@
                 "rc-tabs": "^15.4.0",
                 "react": "^18.2.0",
                 "react-dom": "^18.3.1",
-                "react-router-dom": "^7.0.1",
+                "react-router-dom": "^7.0.2",
                 "react-timer-hook": "^3.0.8",
                 "yaml": "^2.6.1",
                 "zustand": "^5.0.1"
@@ -29,14 +29,14 @@
                 "@eslint/compat": "^1.2.3",
                 "@eslint/eslintrc": "^3.2.0",
                 "@eslint/js": "^9.16.0",
-                "@hey-api/openapi-ts": "^0.58.0",
+                "@hey-api/openapi-ts": "^0.59.1",
                 "@playwright/test": "^1.49.0",
                 "@tanstack/eslint-plugin-query": "^5.62.1",
                 "@types/react": "^18.3.12",
                 "@types/react-dom": "^18.3.1",
                 "@types/uuid": "^10.0.0",
-                "@typescript-eslint/eslint-plugin": "^8.17.0",
-                "@typescript-eslint/parser": "^8.17.0",
+                "@typescript-eslint/eslint-plugin": "^8.18.0",
+                "@typescript-eslint/parser": "^8.18.0",
                 "@vitejs/plugin-react": "^4.3.4",
                 "env-cmd": "^10.1.0",
                 "eslint": "^9.16.0",
@@ -46,7 +46,7 @@
                 "eslint-plugin-import": "^2.31.0",
                 "eslint-plugin-prettier": "^5.2.1",
                 "eslint-plugin-react": "^7.37.2",
-                "eslint-plugin-react-hooks": "^5.0.0",
+                "eslint-plugin-react-hooks": "^5.1.0",
                 "eslint-plugin-require-explicit-generics": "^1.0.0",
                 "knip": "^5.39.1",
                 "playwright-core": "^1.49.0",
@@ -54,9 +54,9 @@
                 "prettier-plugin-organize-imports": "^4.1.0",
                 "release-it": "^17.10.0",
                 "typescript": "5.7.2",
-                "typescript-eslint": "^8.17.0",
+                "typescript-eslint": "^8.18.0",
                 "uuid": "^11.0.3",
-                "vite": "^6.0.2"
+                "vite": "^6.0.3"
             }
         },
         "node_modules/@aashutoshrathi/word-wrap": {
@@ -1067,11 +1067,10 @@
             }
         },
         "node_modules/@hey-api/openapi-ts": {
-            "version": "0.58.0",
-            "resolved": "https://registry.npmjs.org/@hey-api/openapi-ts/-/openapi-ts-0.58.0.tgz",
-            "integrity": "sha512-ynOsoDwtQ3wyknufMbjeOc6GgUfLN50o0y6rtMIWSggb9Rl5VJsqdQZs0b5Z9GW8MU8uYQO9b8gskR4dQ2gqLg==",
+            "version": "0.59.1",
+            "resolved": "https://registry.npmjs.org/@hey-api/openapi-ts/-/openapi-ts-0.59.1.tgz",
+            "integrity": "sha512-6/GeQFr4tMNFirkyuaTivYAvBoU5qQtcvbLtGnx2mlGkheBpdrcZQDqtNYpSKIUlGw/czTkzwVA4T8hYSWxcJQ==",
             "dev": true,
-            "license": "FSL-1.1-MIT",
             "dependencies": {
                 "@apidevtools/json-schema-ref-parser": "11.7.2",
                 "c12": "2.0.1",
@@ -1962,22 +1961,20 @@
             }
         },
         "node_modules/@tanstack/query-core": {
-            "version": "5.62.1",
-            "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.62.1.tgz",
-            "integrity": "sha512-thYv90GkMcfumgmtp6sptC18SqxWwXTCKUuk7jyeHHn7kYouh0VJrowuuBffAIBiR3Z8OnsccmPUnP1leKJBVQ==",
-            "license": "MIT",
+            "version": "5.62.3",
+            "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.62.3.tgz",
+            "integrity": "sha512-Jp/nYoz8cnO7kqhOlSv8ke/0MJRJVGuZ0P/JO9KQ+f45mpN90hrerzavyTKeSoT/pOzeoOUkv1Xd0wPsxAWXfg==",
             "funding": {
                 "type": "github",
                 "url": "https://github.com/sponsors/tannerlinsley"
             }
         },
         "node_modules/@tanstack/react-query": {
-            "version": "5.62.1",
-            "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.62.1.tgz",
-            "integrity": "sha512-gb4eglrgW+yOeiNPkpqFyN8oLrFafHrHE+q2LzVl7TfyA4fuQluH92NTl6Jed7ae35v+BNtAQng9mykywWLzfA==",
-            "license": "MIT",
+            "version": "5.62.3",
+            "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.62.3.tgz",
+            "integrity": "sha512-y2zDNKuhgiuMgsKkqd4AcsLIBiCfEO8U11AdrtAUihmLbRNztPrlcZqx2lH1GacZsx+y1qRRbCcJLYTtF1vKsw==",
             "dependencies": {
-                "@tanstack/query-core": "5.62.1"
+                "@tanstack/query-core": "5.62.3"
             },
             "funding": {
                 "type": "github",
@@ -2115,17 +2112,16 @@
             "dev": true
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.17.0.tgz",
-            "integrity": "sha512-HU1KAdW3Tt8zQkdvNoIijfWDMvdSweFYm4hWh+KwhPstv+sCmWb89hCIP8msFm9N1R/ooh9honpSuvqKWlYy3w==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.0.tgz",
+            "integrity": "sha512-NR2yS7qUqCL7AIxdJUQf2MKKNDVNaig/dEB0GBLU7D+ZdHgK1NoH/3wsgO3OnPVipn51tG3MAwaODEGil70WEw==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.17.0",
-                "@typescript-eslint/type-utils": "8.17.0",
-                "@typescript-eslint/utils": "8.17.0",
-                "@typescript-eslint/visitor-keys": "8.17.0",
+                "@typescript-eslint/scope-manager": "8.18.0",
+                "@typescript-eslint/type-utils": "8.18.0",
+                "@typescript-eslint/utils": "8.18.0",
+                "@typescript-eslint/visitor-keys": "8.18.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.3.1",
                 "natural-compare": "^1.4.0",
@@ -2140,25 +2136,20 @@
             },
             "peerDependencies": {
                 "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-                "eslint": "^8.57.0 || ^9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.17.0.tgz",
-            "integrity": "sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.0.tgz",
+            "integrity": "sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==",
             "dev": true,
-            "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.17.0",
-                "@typescript-eslint/types": "8.17.0",
-                "@typescript-eslint/typescript-estree": "8.17.0",
-                "@typescript-eslint/visitor-keys": "8.17.0",
+                "@typescript-eslint/scope-manager": "8.18.0",
+                "@typescript-eslint/types": "8.18.0",
+                "@typescript-eslint/typescript-estree": "8.18.0",
+                "@typescript-eslint/visitor-keys": "8.18.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2169,23 +2160,18 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "eslint": "^8.57.0 || ^9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.17.0.tgz",
-            "integrity": "sha512-/ewp4XjvnxaREtqsZjF4Mfn078RD/9GmiEAtTeLQ7yFdKnqwTOgRMSvFz4et9U5RiJQ15WTGXPLj89zGusvxBg==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz",
+            "integrity": "sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.17.0",
-                "@typescript-eslint/visitor-keys": "8.17.0"
+                "@typescript-eslint/types": "8.18.0",
+                "@typescript-eslint/visitor-keys": "8.18.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2196,14 +2182,13 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.17.0.tgz",
-            "integrity": "sha512-q38llWJYPd63rRnJ6wY/ZQqIzPrBCkPdpIsaCfkR3Q4t3p6sb422zougfad4TFW9+ElIFLVDzWGiGAfbb/v2qw==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.0.tgz",
+            "integrity": "sha512-er224jRepVAVLnMF2Q7MZJCq5CsdH2oqjP4dT7K6ij09Kyd+R21r7UVJrF0buMVdZS5QRhDzpvzAxHxabQadow==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.17.0",
-                "@typescript-eslint/utils": "8.17.0",
+                "@typescript-eslint/typescript-estree": "8.18.0",
+                "@typescript-eslint/utils": "8.18.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^1.3.0"
             },
@@ -2215,20 +2200,15 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "eslint": "^8.57.0 || ^9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.17.0.tgz",
-            "integrity": "sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",
+            "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==",
             "dev": true,
-            "license": "MIT",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
@@ -2238,14 +2218,13 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.17.0.tgz",
-            "integrity": "sha512-JqkOopc1nRKZpX+opvKqnM3XUlM7LpFMD0lYxTqOTKQfCWAmxw45e3qlOCsEqEB2yuacujivudOFpCnqkBDNMw==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz",
+            "integrity": "sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==",
             "dev": true,
-            "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/types": "8.17.0",
-                "@typescript-eslint/visitor-keys": "8.17.0",
+                "@typescript-eslint/types": "8.18.0",
+                "@typescript-eslint/visitor-keys": "8.18.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -2260,10 +2239,8 @@
                 "type": "opencollective",
                 "url": "https://opencollective.com/typescript-eslint"
             },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <5.8.0"
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -2271,7 +2248,6 @@
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
             "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
             }
@@ -2281,7 +2257,6 @@
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
             "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
             "dev": true,
-            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^2.0.1"
             },
@@ -2297,7 +2272,6 @@
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
             "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
             "dev": true,
-            "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
             },
@@ -2306,16 +2280,15 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.17.0.tgz",
-            "integrity": "sha512-bQC8BnEkxqG8HBGKwG9wXlZqg37RKSMY7v/X8VEWD8JG2JuTHuNK0VFvMPMUKQcbk6B+tf05k+4AShAEtCtJ/w==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.0.tgz",
+            "integrity": "sha512-p6GLdY383i7h5b0Qrfbix3Vc3+J2k6QWw6UMUeY5JGfm3C5LbZ4QIZzJNoNOfgyRe0uuYKjvVOsO/jD4SJO+xg==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.17.0",
-                "@typescript-eslint/types": "8.17.0",
-                "@typescript-eslint/typescript-estree": "8.17.0"
+                "@typescript-eslint/scope-manager": "8.18.0",
+                "@typescript-eslint/types": "8.18.0",
+                "@typescript-eslint/typescript-estree": "8.18.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2325,22 +2298,17 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "eslint": "^8.57.0 || ^9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.17.0.tgz",
-            "integrity": "sha512-1Hm7THLpO6ww5QU6H/Qp+AusUUl+z/CAm3cNZZ0jQvon9yicgO7Rwd+/WWRpMKLYV6p2UvdbR27c86rzCPpreg==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz",
+            "integrity": "sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.17.0",
+                "@typescript-eslint/types": "8.18.0",
                 "eslint-visitor-keys": "^4.2.0"
             },
             "engines": {
@@ -2356,7 +2324,6 @@
             "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
             "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
             "dev": true,
-            "license": "Apache-2.0",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
@@ -4240,11 +4207,10 @@
             }
         },
         "node_modules/eslint-plugin-react-hooks": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0.tgz",
-            "integrity": "sha512-hIOwI+5hYGpJEc4uPRmz2ulCjAGD/N13Lukkh8cLV0i2IRk/bdZDYjgLVHj+U9Z704kLIdIO6iueGvxNur0sgw==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz",
+            "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==",
             "dev": true,
-            "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
@@ -8341,9 +8307,9 @@
             }
         },
         "node_modules/react-router": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.1.tgz",
-            "integrity": "sha512-WVAhv9oWCNsja5AkK6KLpXJDSJCQizOIyOd4vvB/+eHGbYx5vkhcmcmwWjQ9yqkRClogi+xjEg9fNEOd5EX/tw==",
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz",
+            "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==",
             "license": "MIT",
             "dependencies": {
                 "@types/cookie": "^0.6.0",
@@ -8365,12 +8331,12 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.1.tgz",
-            "integrity": "sha512-duBzwAAiIabhFPZfDjcYpJ+f08TMbPMETgq254GWne2NW1ZwRHhZLj7tpSp8KGb7JvZzlLcjGUnqLxpZQVEPng==",
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz",
+            "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==",
             "license": "MIT",
             "dependencies": {
-                "react-router": "7.0.1"
+                "react-router": "7.0.2"
             },
             "engines": {
                 "node": ">=20.0.0"
@@ -9818,15 +9784,14 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.17.0.tgz",
-            "integrity": "sha512-409VXvFd/f1br1DCbuKNFqQpXICoTB+V51afcwG1pn1a3Cp92MqAUges3YjwEdQ0cMUoCIodjVDAYzyD8h3SYA==",
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.18.0.tgz",
+            "integrity": "sha512-Xq2rRjn6tzVpAyHr3+nmSg1/9k9aIHnJ2iZeOH7cfGOWqTkXTm3kwpQglEuLGdNrYvPF+2gtAs+/KF5rjVo+WQ==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.17.0",
-                "@typescript-eslint/parser": "8.17.0",
-                "@typescript-eslint/utils": "8.17.0"
+                "@typescript-eslint/eslint-plugin": "8.18.0",
+                "@typescript-eslint/parser": "8.18.0",
+                "@typescript-eslint/utils": "8.18.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9836,12 +9801,8 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "eslint": "^8.57.0 || ^9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
             }
         },
         "node_modules/ufo": {
@@ -10041,11 +10002,10 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-            "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+            "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.24.0",
                 "postcss": "^8.4.49",
diff --git a/package.json b/package.json
index 4a1ad12eb..c6c9a0393 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "dependencies": {
         "@ant-design/icons": "^5.5.2",
         "@axa-fr/react-oidc": "^7.23.1",
-        "@tanstack/react-query": "^5.62.1",
+        "@tanstack/react-query": "^5.62.3",
         "antd": "^5.22.3",
         "echarts": "5.5.1",
         "echarts-for-react": "^3.0.2",
@@ -15,7 +15,7 @@
         "rc-tabs": "^15.4.0",
         "react": "^18.2.0",
         "react-dom": "^18.3.1",
-        "react-router-dom": "^7.0.1",
+        "react-router-dom": "^7.0.2",
         "react-timer-hook": "^3.0.8",
         "yaml": "^2.6.1",
         "zustand": "^5.0.1"
@@ -46,15 +46,15 @@
         "@eslint/compat": "^1.2.3",
         "@eslint/eslintrc": "^3.2.0",
         "@eslint/js": "^9.16.0",
-        "@hey-api/openapi-ts": "^0.58.0",
+        "@hey-api/openapi-ts": "^0.59.1",
         "playwright-core": "^1.49.0",
         "@playwright/test": "^1.49.0",
         "@tanstack/eslint-plugin-query": "^5.62.1",
         "@types/react": "^18.3.12",
         "@types/react-dom": "^18.3.1",
         "@types/uuid": "^10.0.0",
-        "@typescript-eslint/eslint-plugin": "^8.17.0",
-        "@typescript-eslint/parser": "^8.17.0",
+        "@typescript-eslint/eslint-plugin": "^8.18.0",
+        "@typescript-eslint/parser": "^8.18.0",
         "@vitejs/plugin-react": "^4.3.4",
         "env-cmd": "^10.1.0",
         "eslint": "^9.16.0",
@@ -64,7 +64,7 @@
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-react": "^7.37.2",
-        "eslint-plugin-react-hooks": "^5.0.0",
+        "eslint-plugin-react-hooks": "^5.1.0",
         "eslint-plugin-require-explicit-generics": "^1.0.0",
         "knip": "^5.39.1",
         "prettier": "3.4.1",
@@ -72,8 +72,8 @@
         "release-it": "^17.10.0",
         "typescript": "5.7.2",
         "uuid": "^11.0.3",
-        "vite": "^6.0.2",
-        "typescript-eslint": "^8.17.0"
+        "vite": "^6.0.3",
+        "typescript-eslint": "^8.18.0"
     },
     "overrides": {
         "react-scripts": {
diff --git a/src/components/content/deployedServices/myServices/MyServiceHistory.tsx b/src/components/content/deployedServices/myServices/MyServiceHistory.tsx
index c05dc2390..ef518f74b 100644
--- a/src/components/content/deployedServices/myServices/MyServiceHistory.tsx
+++ b/src/components/content/deployedServices/myServices/MyServiceHistory.tsx
@@ -3,87 +3,131 @@
  * SPDX-FileCopyrightText: Huawei Inc.
  */
 
-import { CheckCircleOutlined, MinusCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons';
-import { Table, Tag, Tooltip, Typography } from 'antd';
+import { CheckCircleOutlined, ClockCircleOutlined, CloseCircleOutlined, SyncOutlined } from '@ant-design/icons';
+import { Button, Popover, Table, Tag, Typography } from 'antd';
 import { ColumnsType } from 'antd/es/table';
+import { ColumnFilterItem } from 'antd/es/table/interface';
 import React from 'react';
 import serviceModifyStyles from '../../../../styles/service-modify.module.css';
 import {
-    DeployRequest,
     DeployedServiceDetails,
+    ErrorResponse,
     ServiceOrderDetails,
-    VendorHostedDeployedServiceDetails,
     taskStatus,
+    taskType,
+    VendorHostedDeployedServiceDetails,
 } from '../../../../xpanse-api/generated';
-import useListServiceModifyHistoryQuery from './query/useListServiceModifyHistoryQuery';
+import { MyServiceHistoryDetails } from './MyServiceHistoryDetails.tsx';
+import useListServiceOrdersHistoryQuery from './query/useListServiceModifyHistoryQuery.ts';
 
-const { Text } = Typography;
+const { Paragraph } = Typography;
 
 export const MyServiceHistory = ({
     deployedService,
 }: {
     deployedService: DeployedServiceDetails | VendorHostedDeployedServiceDetails;
 }): React.JSX.Element => {
-    let serviceModificationAuditHistoryList: ServiceOrderDetails[] = [];
-    const listServiceModifyHistoryQuery = useListServiceModifyHistoryQuery(deployedService.serviceId);
+    let orderIdFilters: ColumnFilterItem[] = [];
+    let taskTypeFilters: ColumnFilterItem[] = [];
+    let taskStatusFilters: ColumnFilterItem[] = [];
+    let serviceOrdersHistoryList: ServiceOrderDetails[] = [];
+    const listServiceOrdersHistoryQuery = useListServiceOrdersHistoryQuery(deployedService.serviceId);
+
+    if (listServiceOrdersHistoryQuery.isSuccess && listServiceOrdersHistoryQuery.data.length > 0) {
+        serviceOrdersHistoryList = listServiceOrdersHistoryQuery.data;
+        updateOrderIdFilters(listServiceOrdersHistoryQuery.data);
+        updateTaskTypeFilters();
+        updateTaskStatusFilters();
+    }
+
+    function updateOrderIdFilters(resp: ServiceOrderDetails[]): void {
+        const filters: ColumnFilterItem[] = [];
+        resp.forEach((respItem) => {
+            const filter = {
+                text: respItem.orderId,
+                value: respItem.orderId,
+            };
+            filters.push(filter);
+        });
+        orderIdFilters = filters;
+    }
+
+    function updateTaskTypeFilters(): void {
+        const filters: ColumnFilterItem[] = [];
+        Object.values(taskType).forEach((taskTypeItem) => {
+            const filter = {
+                text: taskTypeItem,
+                value: taskTypeItem,
+            };
+            filters.push(filter);
+        });
+        taskTypeFilters = filters;
+    }
 
-    if (listServiceModifyHistoryQuery.isSuccess && listServiceModifyHistoryQuery.data.length > 0) {
-        serviceModificationAuditHistoryList = listServiceModifyHistoryQuery.data;
+    function updateTaskStatusFilters(): void {
+        const filters: ColumnFilterItem[] = [];
+        Object.values(taskStatus).forEach((taskStatusItem) => {
+            const filter = {
+                text: taskStatusItem,
+                value: taskStatusItem,
+            };
+            filters.push(filter);
+        });
+        taskStatusFilters = filters;
     }
 
     const columns: ColumnsType<ServiceOrderDetails> = [
         {
-            title: 'ModifyId',
+            title: 'OrderId',
             dataIndex: 'orderId',
             align: 'center',
             width: 100,
-            className: serviceModifyStyles.modifyHistoryValue,
-        },
-        {
-            title: 'Previous',
-            dataIndex: 'previousDeployRequest',
-            width: 300,
-            className: serviceModifyStyles.modifyHistoryValue,
-            align: 'center',
-            render: (value: DeployRequest) => {
+            filters: orderIdFilters,
+            filterMode: 'tree',
+            filterSearch: true,
+            onFilter: (value: React.Key | boolean, record) => record.orderId.startsWith(value.toString()),
+            render: (value: string) => {
                 return (
-                    <ul className={serviceModifyStyles.modifyHistoryValueLi}>
-                        <li>
-                            <Text strong>Customer Service Name:</Text>&nbsp;{value.customerServiceName}
-                        </li>
-                        {value.serviceRequestProperties ? (
-                            <li>
-                                <Text strong>Service Request Properties:</Text>&nbsp;
-                                {JSON.stringify(value.serviceRequestProperties)}
-                            </li>
-                        ) : (
-                            <></>
-                        )}
-                    </ul>
+                    <div className={serviceModifyStyles.serviceHistoryValue}>
+                        <Paragraph
+                            className={serviceModifyStyles.serviceHistoryOrderIdClass}
+                            ellipsis={true}
+                            copyable={{ tooltips: value }}
+                        >
+                            {value}
+                        </Paragraph>
+                    </div>
                 );
             },
         },
         {
-            title: 'New',
-            dataIndex: 'newDeployRequest',
-            className: serviceModifyStyles.modifyHistoryValue,
+            title: 'TaskType',
+            dataIndex: 'taskType',
             align: 'center',
-            width: 300,
-            render: (value: DeployRequest) => {
+            width: 100,
+            filters: taskTypeFilters,
+            filterMode: 'tree',
+            filterSearch: true,
+            onFilter: (value: React.Key | boolean, record) => record.taskType.startsWith(value.toString()),
+        },
+        {
+            title: 'Details',
+            dataIndex: 'details',
+            width: 100,
+            align: 'center',
+            render: (_, record) => {
                 return (
-                    <ul className={serviceModifyStyles.modifyHistoryValueLi}>
-                        <li>
-                            <Text strong>Customer Service Name:</Text>&nbsp;{value.customerServiceName}
-                        </li>
-                        {value.serviceRequestProperties ? (
-                            <li>
-                                <Text strong>Service Request Properties:</Text>&nbsp;
-                                {JSON.stringify(value.serviceRequestProperties)}
-                            </li>
-                        ) : (
-                            <></>
-                        )}
-                    </ul>
+                    <div>
+                        <Popover
+                            content={<MyServiceHistoryDetails record={record} />}
+                            title={'Details'}
+                            trigger='hover'
+                        >
+                            <Button className={serviceModifyStyles.serviceOrderErrorDataHover} type={'link'}>
+                                {'details'}
+                            </Button>
+                        </Popover>
+                    </div>
                 );
             },
         },
@@ -92,22 +136,45 @@ export const MyServiceHistory = ({
             dataIndex: 'startedTime',
             align: 'center',
             width: 150,
+            defaultSortOrder: 'descend',
+            sorter: (serviceOrderDetailsA, serviceOrderDetailsB): number => {
+                if (serviceOrderDetailsA.startedTime && serviceOrderDetailsB.startedTime) {
+                    return (
+                        new Date(serviceOrderDetailsA.startedTime).getTime() -
+                        new Date(serviceOrderDetailsB.startedTime).getTime()
+                    );
+                }
+                return 0;
+            },
         },
         {
             title: 'CompletedTime',
             dataIndex: 'completedTime',
             align: 'center',
             width: 150,
+            sorter: (serviceOrderDetailsA, serviceOrderDetailsB): number => {
+                if (serviceOrderDetailsA.completedTime && serviceOrderDetailsB.completedTime) {
+                    return (
+                        new Date(serviceOrderDetailsA.completedTime).getTime() -
+                        new Date(serviceOrderDetailsB.completedTime).getTime()
+                    );
+                }
+                return 0;
+            },
         },
         {
-            title: 'Status',
+            title: 'TaskStatus',
             dataIndex: 'taskStatus',
             align: 'center',
             width: 50,
+            filters: taskStatusFilters,
+            filterMode: 'tree',
+            filterSearch: true,
+            onFilter: (value: React.Key | boolean, record) => record.taskStatus.startsWith(value.toString()),
             render: (value) => {
                 if (value === taskStatus.FAILED) {
                     return (
-                        <Tag icon={<QuestionCircleOutlined />} color={'error'}>
+                        <Tag icon={<CloseCircleOutlined />} color={'error'}>
                             {value}
                         </Tag>
                     );
@@ -117,9 +184,15 @@ export const MyServiceHistory = ({
                             {value}
                         </Tag>
                     );
+                } else if (value === taskStatus.IN_PROGRESS) {
+                    return (
+                        <Tag icon={<SyncOutlined />} color={'orange'}>
+                            {value}
+                        </Tag>
+                    );
                 } else {
                     return (
-                        <Tag icon={<MinusCircleOutlined />} color={'default'}>
+                        <Tag icon={<ClockCircleOutlined />} color={'default'}>
                             {value}
                         </Tag>
                     );
@@ -128,15 +201,21 @@ export const MyServiceHistory = ({
         },
         {
             title: 'Failure Reason',
-            dataIndex: 'errorMsg',
+            dataIndex: 'errorResponse',
             align: 'center',
-            width: 150,
-            render: (value: string | undefined) => {
+            width: 100,
+            render: (value: ErrorResponse | undefined) => {
                 if (value) {
                     return (
-                        <Tooltip title={value}>
-                            <span className={serviceModifyStyles.modifyHistoryErrorMsgValue}>{value}</span>
-                        </Tooltip>
+                        <Popover
+                            content={<pre className={serviceModifyStyles.serviceOrderErrorText}>{value.details}</pre>}
+                            title={value.errorType}
+                            trigger='hover'
+                        >
+                            <Button className={serviceModifyStyles.serviceOrderErrorDataHover} type={'link'}>
+                                {'failure reason'}
+                            </Button>
+                        </Popover>
                     );
                 }
             },
@@ -147,8 +226,8 @@ export const MyServiceHistory = ({
         <div className={serviceModifyStyles.modifyContainer}>
             <Table
                 columns={columns}
-                dataSource={serviceModificationAuditHistoryList}
-                loading={listServiceModifyHistoryQuery.isPending || listServiceModifyHistoryQuery.isRefetching}
+                dataSource={serviceOrdersHistoryList}
+                loading={listServiceOrdersHistoryQuery.isPending || listServiceOrdersHistoryQuery.isRefetching}
                 rowKey={'id'}
                 scroll={{ x: 'max-content' }}
             />
diff --git a/src/components/content/deployedServices/myServices/MyServiceHistoryDetails.tsx b/src/components/content/deployedServices/myServices/MyServiceHistoryDetails.tsx
new file mode 100644
index 000000000..db1f37a20
--- /dev/null
+++ b/src/components/content/deployedServices/myServices/MyServiceHistoryDetails.tsx
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: Huawei Inc.
+ */
+
+import { Typography } from 'antd';
+import serviceModifyStyles from '../../../../styles/service-modify.module.css';
+import { ServiceOrderDetails } from '../../../../xpanse-api/generated';
+
+const { Text } = Typography;
+
+export const MyServiceHistoryDetails = ({ record }: { record: ServiceOrderDetails }) => {
+    const previousDeployRequest = record.previousDeployRequest;
+    const newDeployRequest = record.newDeployRequest;
+
+    const previousContent = previousDeployRequest ? (
+        <ul className={serviceModifyStyles.modifyHistoryValueLi}>
+            <li>
+                <Text strong>Customer Service Name:</Text>&nbsp;{previousDeployRequest.customerServiceName}
+            </li>
+            {previousDeployRequest.serviceRequestProperties ? (
+                <li>
+                    <Text strong>Service Request Properties:</Text>&nbsp;
+                    {JSON.stringify(previousDeployRequest.serviceRequestProperties)}
+                </li>
+            ) : (
+                <></>
+            )}
+        </ul>
+    ) : null;
+
+    const newContent = newDeployRequest ? (
+        <ul className={serviceModifyStyles.modifyHistoryValueLi}>
+            <li>
+                <Text strong>Customer Service Name:</Text>&nbsp;{newDeployRequest.customerServiceName}
+            </li>
+            {newDeployRequest.serviceRequestProperties ? (
+                <li>
+                    <Text strong>Service Request Properties:</Text>&nbsp;
+                    {JSON.stringify(newDeployRequest.serviceRequestProperties)}
+                </li>
+            ) : (
+                <></>
+            )}
+        </ul>
+    ) : null;
+
+    return (
+        <div>
+            <h4>Previous Deploy Request:</h4>
+            {previousContent}
+            <h4>New Deploy Request:</h4>
+            {newContent}
+        </div>
+    );
+};
diff --git a/src/components/content/deployedServices/myServices/MyServices.tsx b/src/components/content/deployedServices/myServices/MyServices.tsx
index 897b6d201..f936ec291 100644
--- a/src/components/content/deployedServices/myServices/MyServices.tsx
+++ b/src/components/content/deployedServices/myServices/MyServices.tsx
@@ -693,7 +693,7 @@ function MyServices(): React.JSX.Element {
                         icon={<HistoryOutlined />}
                         type={'link'}
                     >
-                        history
+                        order history
                     </Button>
                 ),
             },
@@ -1607,7 +1607,7 @@ function MyServices(): React.JSX.Element {
             ) : null}
             {activeRecord ? (
                 <Modal
-                    title={'Service Modified History'}
+                    title={'Service Orders'}
                     width={1600}
                     footer={null}
                     open={isMyServiceHistoryModalOpen}
diff --git a/src/components/content/deployedServices/myServices/query/useListServiceModifyHistoryQuery.ts b/src/components/content/deployedServices/myServices/query/useListServiceModifyHistoryQuery.ts
index cfcb3ecbe..fe592d048 100644
--- a/src/components/content/deployedServices/myServices/query/useListServiceModifyHistoryQuery.ts
+++ b/src/components/content/deployedServices/myServices/query/useListServiceModifyHistoryQuery.ts
@@ -6,14 +6,12 @@
 import { useQuery } from '@tanstack/react-query';
 import { getAllOrdersByServiceId, GetAllOrdersByServiceIdData } from '../../../../../xpanse-api/generated';
 
-export default function useListServiceModifyHistoryQuery(serviceId: string) {
+export default function useListServiceOrdersHistoryQuery(serviceId: string) {
     return useQuery({
         queryKey: ['listDeployedServicesByIsv', serviceId],
         queryFn: () => {
             const data: GetAllOrdersByServiceIdData = {
                 serviceId: serviceId,
-                taskType: 'modify',
-                taskStatus: undefined,
             };
             return getAllOrdersByServiceId(data);
         },
diff --git a/src/components/content/order/common/availabilityzone/AvailabilityZoneFormItem.tsx b/src/components/content/order/common/availabilityzone/AvailabilityZoneFormItem.tsx
index ee22f83b3..df90d911a 100644
--- a/src/components/content/order/common/availabilityzone/AvailabilityZoneFormItem.tsx
+++ b/src/components/content/order/common/availabilityzone/AvailabilityZoneFormItem.tsx
@@ -18,14 +18,20 @@ export function AvailabilityZoneFormItem({
     onAvailabilityZoneChange,
     selectAvailabilityZones,
     selectCsp,
+    selectedServiceTemplateId,
 }: {
     availabilityZoneConfig: AvailabilityZoneConfig;
     selectRegion: Region;
     onAvailabilityZoneChange: (varName: string, availabilityZone: string | undefined) => void;
     selectAvailabilityZones: Record<string, string | undefined>;
     selectCsp: csp;
+    selectedServiceTemplateId: string;
 }): React.JSX.Element {
-    const availabilityZonesVariableRequest = useGetAvailabilityZonesForRegionQuery(selectCsp, selectRegion);
+    const availabilityZonesVariableRequest = useGetAvailabilityZonesForRegionQuery(
+        selectCsp,
+        selectRegion,
+        selectedServiceTemplateId
+    );
     const retryRequest = () => {
         if (availabilityZonesVariableRequest.isError) {
             void availabilityZonesVariableRequest.refetch();
diff --git a/src/components/content/order/common/utils/useGetAvailabilityZonesForRegionQuery.tsx b/src/components/content/order/common/utils/useGetAvailabilityZonesForRegionQuery.tsx
index 4beb78720..6d2b90dbf 100644
--- a/src/components/content/order/common/utils/useGetAvailabilityZonesForRegionQuery.tsx
+++ b/src/components/content/order/common/utils/useGetAvailabilityZonesForRegionQuery.tsx
@@ -6,14 +6,19 @@
 import { useQuery } from '@tanstack/react-query';
 import { csp, getAvailabilityZones, type GetAvailabilityZonesData, Region } from '../../../../../xpanse-api/generated';
 
-export default function useGetAvailabilityZonesForRegionQuery(csp: csp, region: Region) {
+export default function useGetAvailabilityZonesForRegionQuery(
+    csp: csp,
+    region: Region,
+    selectedServiceTemplateId: string
+) {
     return useQuery({
-        queryKey: ['availabilityZonesForRegionQuery', csp, region],
+        queryKey: ['availabilityZonesForRegionQuery', csp, region, selectedServiceTemplateId],
         queryFn: () => {
             const data: GetAvailabilityZonesData = {
                 cspName: csp,
                 siteName: region.site,
                 regionName: region.name,
+                serviceTemplateId: selectedServiceTemplateId,
             };
             return getAvailabilityZones(data);
         },
diff --git a/src/components/content/order/create/SelectServiceForm.tsx b/src/components/content/order/create/SelectServiceForm.tsx
index 6c3285aef..aaabd63e4 100644
--- a/src/components/content/order/create/SelectServiceForm.tsx
+++ b/src/components/content/order/create/SelectServiceForm.tsx
@@ -100,6 +100,15 @@ export function SelectServiceForm({ services }: { services: UserOrderableService
         versionToServicesMap.get(selectVersion)
     );
     const [selectRegion, setSelectRegion] = useState<Region>(serviceInfo ? serviceInfo.region : regionList[0].region);
+    const getServiceTemplateId = (): string => {
+        const service = services.find(
+            (service) =>
+                service.version === selectVersion &&
+                service.csp === selectCsp &&
+                selectServiceHostType === service.serviceHostingType
+        );
+        return service ? service.serviceTemplateId : '';
+    };
     const [selectAvailabilityZones, setSelectAvailabilityZones] = useState<Record<string, string>>(
         serviceInfo?.availabilityZones ?? {}
     );
@@ -135,7 +144,11 @@ export function SelectServiceForm({ services }: { services: UserOrderableService
         getContactServiceDetailsOfServiceByCsp(selectCsp, versionToServicesMap.get(selectVersion));
     const currentEula: string | undefined = getEulaByCsp(selectCsp, versionToServicesMap.get(selectVersion));
 
-    const getAvailabilityZonesForRegionQuery = useGetAvailabilityZonesForRegionQuery(selectCsp, selectRegion);
+    const getAvailabilityZonesForRegionQuery = useGetAvailabilityZonesForRegionQuery(
+        selectCsp,
+        selectRegion,
+        getServiceTemplateId()
+    );
     const availabilityZoneConfigs: AvailabilityZoneConfig[] = getAvailabilityZoneRequirementsForAService(
         selectCsp,
         services
@@ -279,16 +292,6 @@ export function SelectServiceForm({ services }: { services: UserOrderableService
         return availabilityZoneConfigs.filter((availabilityZoneConfig) => availabilityZoneConfig.mandatory).length > 0;
     }
 
-    const getServiceTemplateId = (): string => {
-        const service = services.find(
-            (service) =>
-                service.version === selectVersion &&
-                service.csp === selectCsp &&
-                selectServiceHostType === service.serviceHostingType
-        );
-        return service ? service.serviceTemplateId : '';
-    };
-
     const getServicePriceQuery = useGetServicePricesQuery(
         getServiceTemplateId(),
         selectRegion.name,
@@ -410,6 +413,7 @@ export function SelectServiceForm({ services }: { services: UserOrderableService
                                         selectAvailabilityZones={selectAvailabilityZones}
                                         selectCsp={selectCsp}
                                         key={availabilityZoneConfig.varName}
+                                        selectedServiceTemplateId={getServiceTemplateId()}
                                     />
                                 </div>
                             );
diff --git a/src/components/content/order/migrate/SelectDestination.tsx b/src/components/content/order/migrate/SelectDestination.tsx
index 53147dcc5..9c661d15c 100644
--- a/src/components/content/order/migrate/SelectDestination.tsx
+++ b/src/components/content/order/migrate/SelectDestination.tsx
@@ -95,7 +95,17 @@ export const SelectDestination = ({
     getServicePriceQuery: UseQueryResult<ServiceFlavorWithPriceResult[]>;
 }): React.JSX.Element => {
     const [form] = Form.useForm();
-    const getAvailabilityZonesForRegionQuery = useGetAvailabilityZonesForRegionQuery(selectCsp, selectRegion);
+    const getServiceTemplateId = (): string => {
+        const service = userOrderableServiceVoList.find(
+            (service) => service.csp === selectCsp && selectServiceHostType === service.serviceHostingType
+        );
+        return service ? service.serviceTemplateId : '';
+    };
+    const getAvailabilityZonesForRegionQuery = useGetAvailabilityZonesForRegionQuery(
+        selectCsp,
+        selectRegion,
+        getServiceTemplateId()
+    );
     const availabilityZoneConfigs: AvailabilityZoneConfig[] = getAvailabilityZoneRequirementsForAService(
         selectCsp,
         userOrderableServiceVoList
@@ -297,6 +307,7 @@ export const SelectDestination = ({
                                 selectAvailabilityZones={selectAvailabilityZones}
                                 selectCsp={selectCsp}
                                 key={availabilityZoneConfig.varName}
+                                selectedServiceTemplateId={getServiceTemplateId()}
                             />
                         );
                     })}
diff --git a/src/components/content/review/ServiceReviews.tsx b/src/components/content/review/ServiceReviews.tsx
index 331ed3395..782c9d907 100644
--- a/src/components/content/review/ServiceReviews.tsx
+++ b/src/components/content/review/ServiceReviews.tsx
@@ -12,7 +12,6 @@ import serviceReviewStyles from '../../../styles/service-review.module.css';
 import tableStyles from '../../../styles/table.module.css';
 import {
     category,
-    csp,
     Deployment,
     kind,
     serviceHostingType,
@@ -28,7 +27,6 @@ import useListAllServiceTemplatesQuery from './query/useListAllServiceTemplatesQ
 export default function ServiceReviews(): React.JSX.Element {
     let serviceNameFilters: ColumnFilterItem[] = [];
     let versionFilters: ColumnFilterItem[] = [];
-    let cspFilters: ColumnFilterItem[] = [];
     let categoryFilters: ColumnFilterItem[] = [];
     let serviceHostingTypeFilters: ColumnFilterItem[] = [];
     let registrationStatusFilters: ColumnFilterItem[] = [];
@@ -53,17 +51,6 @@ export default function ServiceReviews(): React.JSX.Element {
         serviceHostingTypeFilters = filters;
     };
 
-    const getCspFilters = (): void => {
-        const filters: ColumnFilterItem[] = [];
-        Object.values(csp).forEach((csp) => {
-            const filter = {
-                text: csp,
-                value: csp,
-            };
-            filters.push(filter);
-        });
-        cspFilters = filters;
-    };
     const getServiceNameFilters = (serviceTemplateDetailVoList: ServiceTemplateDetailVo[]): void => {
         const filters: ColumnFilterItem[] = [];
         const nameSet = new Set<string>('');
@@ -137,7 +124,6 @@ export default function ServiceReviews(): React.JSX.Element {
         getServiceNameFilters(allServiceTemplatesListQuery.data);
         getVersionFilters(allServiceTemplatesListQuery.data);
         getServiceHostingTypeFilters();
-        getCspFilters();
         getCategoryFilters();
         getRegistrationStatusFilters();
         getDeployerTypeFilters();
@@ -239,15 +225,6 @@ export default function ServiceReviews(): React.JSX.Element {
             },
             align: 'left',
         },
-        {
-            title: 'Csp',
-            dataIndex: 'csp',
-            filters: cspFilters,
-            filterMode: 'tree',
-            filterSearch: true,
-            onFilter: (value: React.Key | boolean, record) => record.csp.startsWith(value.toString()),
-            align: 'left',
-        },
         {
             title: 'Service Hosting Type',
             dataIndex: 'serviceHostingType',
diff --git a/src/styles/service-modify.module.css b/src/styles/service-modify.module.css
index 6a63707c4..38a4ef2de 100644
--- a/src/styles/service-modify.module.css
+++ b/src/styles/service-modify.module.css
@@ -117,3 +117,31 @@
 .service-modify-warnings-content {
     width: 400px;
 }
+
+.service-order-error-data-hover {
+    padding: 0;
+    font-size: 14px;
+    font-weight: normal;
+}
+
+.service-order-error-text {
+    max-height: 30vh;
+    position: relative;
+    overflow: auto;
+    max-width: 60vh;
+}
+
+.ant-table-cell {
+    height: 100%;
+}
+
+.service-history-value {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+}
+
+.service-history-order-id-class {
+    margin-bottom: 0 !important;
+}
diff --git a/src/xpanse-api/api.json b/src/xpanse-api/api.json
index 992ad11d4..284766c59 100644
--- a/src/xpanse-api/api.json
+++ b/src/xpanse-api/api.json
@@ -135,8 +135,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -145,8 +145,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -155,8 +155,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -165,8 +165,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -175,8 +175,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -241,8 +241,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -251,8 +251,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -261,8 +261,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -271,8 +271,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -281,8 +281,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -355,8 +355,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -365,8 +365,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -375,8 +375,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -385,8 +385,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -395,8 +395,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -455,8 +455,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -465,8 +465,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -475,8 +475,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -485,8 +485,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -495,8 +495,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -545,8 +545,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -555,8 +555,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -565,8 +565,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -575,8 +575,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -585,8 +585,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -675,8 +675,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -685,8 +685,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -695,8 +695,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -705,8 +705,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -715,8 +715,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -767,8 +767,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -777,8 +777,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -787,8 +787,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -797,8 +797,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -807,8 +807,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -866,8 +866,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -876,8 +876,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -886,8 +886,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -896,8 +896,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -906,8 +906,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -965,8 +965,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -975,8 +975,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -985,8 +985,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -995,8 +995,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1005,8 +1005,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1064,8 +1064,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1074,8 +1074,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1084,8 +1084,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1094,8 +1094,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1104,8 +1104,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1174,7 +1174,7 @@
                             }
                         }
                     },
-                    "502": {
+                    "400": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1184,7 +1184,7 @@
                             }
                         }
                     },
-                    "401": {
+                    "422": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1194,7 +1194,7 @@
                             }
                         }
                     },
-                    "400": {
+                    "502": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1204,7 +1204,7 @@
                             }
                         }
                     },
-                    "422": {
+                    "403": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1214,7 +1214,7 @@
                             }
                         }
                     },
-                    "403": {
+                    "401": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1273,7 +1273,7 @@
                             }
                         }
                     },
-                    "502": {
+                    "400": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1283,7 +1283,7 @@
                             }
                         }
                     },
-                    "401": {
+                    "422": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1293,7 +1293,7 @@
                             }
                         }
                     },
-                    "400": {
+                    "502": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1303,7 +1303,7 @@
                             }
                         }
                     },
-                    "422": {
+                    "403": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1313,7 +1313,7 @@
                             }
                         }
                     },
-                    "403": {
+                    "401": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -1383,8 +1383,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1393,8 +1393,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1403,8 +1403,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1413,8 +1413,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1423,8 +1423,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1493,8 +1493,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1503,8 +1503,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1513,8 +1513,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1523,8 +1523,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1533,8 +1533,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1593,8 +1593,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1603,8 +1603,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1613,8 +1613,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1623,8 +1623,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1633,8 +1633,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1710,8 +1710,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1720,8 +1720,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1730,8 +1730,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1740,8 +1740,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1750,8 +1750,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1808,8 +1808,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1818,8 +1818,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1828,8 +1828,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1838,8 +1838,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1848,8 +1848,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1901,8 +1901,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1911,8 +1911,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1921,8 +1921,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1931,8 +1931,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -1941,8 +1941,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2011,8 +2011,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2021,8 +2021,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2031,8 +2031,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2041,8 +2041,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2051,8 +2051,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2104,8 +2104,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2114,8 +2114,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2124,8 +2124,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2134,8 +2134,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2144,8 +2144,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2222,8 +2222,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2232,8 +2232,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2242,8 +2242,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2252,8 +2252,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2262,8 +2262,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2321,8 +2321,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2331,8 +2331,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2341,8 +2341,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2351,8 +2351,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2361,8 +2361,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2429,8 +2429,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2439,8 +2439,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2449,8 +2449,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2459,8 +2459,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2469,8 +2469,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2526,8 +2526,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2536,8 +2536,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2546,8 +2546,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2556,8 +2556,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2566,8 +2566,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2618,8 +2618,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2628,8 +2628,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2638,8 +2638,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2648,8 +2648,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2658,8 +2658,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2726,8 +2726,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2736,8 +2736,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2746,8 +2746,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2756,8 +2756,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2766,8 +2766,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2823,8 +2823,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2833,8 +2833,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2843,8 +2843,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2853,8 +2853,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2863,8 +2863,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2937,8 +2937,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2947,8 +2947,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2957,8 +2957,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2967,8 +2967,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2977,8 +2977,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3037,8 +3037,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3047,8 +3047,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3057,8 +3057,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3067,8 +3067,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3077,8 +3077,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3127,8 +3127,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3137,8 +3137,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3147,8 +3147,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3157,8 +3157,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3167,8 +3167,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3257,8 +3257,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3267,8 +3267,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3277,8 +3277,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3287,8 +3287,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3297,8 +3297,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3360,8 +3360,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3370,8 +3370,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3380,8 +3380,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3390,8 +3390,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3400,8 +3400,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3525,8 +3525,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3535,8 +3535,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3545,8 +3545,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3555,8 +3555,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3565,8 +3565,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3625,7 +3625,7 @@
                             }
                         }
                     },
-                    "502": {
+                    "400": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -3635,7 +3635,7 @@
                             }
                         }
                     },
-                    "401": {
+                    "422": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -3645,7 +3645,7 @@
                             }
                         }
                     },
-                    "400": {
+                    "502": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -3655,7 +3655,7 @@
                             }
                         }
                     },
-                    "422": {
+                    "403": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -3665,7 +3665,7 @@
                             }
                         }
                     },
-                    "403": {
+                    "401": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -3724,8 +3724,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3734,8 +3734,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3744,8 +3744,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3754,8 +3754,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3764,8 +3764,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3913,8 +3913,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3923,8 +3923,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3933,8 +3933,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3943,8 +3943,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -3953,8 +3953,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4013,8 +4013,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4023,8 +4023,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4033,8 +4033,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4043,8 +4043,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4053,8 +4053,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4113,8 +4113,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4123,8 +4123,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4133,8 +4133,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4143,8 +4143,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4153,8 +4153,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4213,8 +4213,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4223,8 +4223,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4233,8 +4233,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4243,8 +4243,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4253,8 +4253,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4313,8 +4313,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4323,8 +4323,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4333,8 +4333,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4343,8 +4343,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4353,8 +4353,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4433,8 +4433,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4443,8 +4443,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4453,8 +4453,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4463,8 +4463,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4473,8 +4473,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4533,8 +4533,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4543,8 +4543,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4553,8 +4553,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4563,8 +4563,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4573,8 +4573,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4634,8 +4634,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4644,8 +4644,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4654,8 +4654,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4664,8 +4664,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4674,8 +4674,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4710,16 +4710,16 @@
                 }
             }
         },
-        "/xpanse/services/{serviceId}/resources/compute": {
+        "/xpanse/services/{serviceId}/service_template": {
             "get": {
                 "tags": ["Service"],
-                "description": "List compute resources of the service.<br> Required role: <b>admin</b> or <b>user</b> </br>",
-                "operationId": "getComputeResourceInventoryOfService",
+                "description": "Get service template details by service id.<br> Required role: <b>admin</b> or <b>isv</b> or <b>user</b> </br>",
+                "operationId": "getOrderableServiceDetailsByServiceId",
                 "parameters": [
                     {
                         "name": "serviceId",
                         "in": "path",
-                        "description": "Id of the deployed service",
+                        "description": "The id of deployed service.",
                         "required": true,
                         "schema": {
                             "type": "string"
@@ -4737,6 +4737,26 @@
                             }
                         }
                     },
+                    "400": {
+                        "description": "Bad Request",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/ErrorResponse"
+                                }
+                            }
+                        }
+                    },
+                    "422": {
+                        "description": "Unprocessable Entity",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/ErrorResponse"
+                                }
+                            }
+                        }
+                    },
                     "502": {
                         "description": "Bad Gateway",
                         "content": {
@@ -4747,6 +4767,16 @@
                             }
                         }
                     },
+                    "403": {
+                        "description": "Forbidden",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/ErrorResponse"
+                                }
+                            }
+                        }
+                    },
                     "401": {
                         "description": "Unauthorized",
                         "content": {
@@ -4757,6 +4787,56 @@
                             }
                         }
                     },
+                    "408": {
+                        "description": "Request Timeout",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/ErrorResponse"
+                                }
+                            }
+                        }
+                    },
+                    "200": {
+                        "description": "OK",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/UserOrderableServiceVo"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/xpanse/services/{serviceId}/resources/compute": {
+            "get": {
+                "tags": ["Service"],
+                "description": "List compute resources of the service.<br> Required role: <b>admin</b> or <b>user</b> </br>",
+                "operationId": "getComputeResourceInventoryOfService",
+                "parameters": [
+                    {
+                        "name": "serviceId",
+                        "in": "path",
+                        "description": "Id of the deployed service",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "500": {
+                        "description": "Internal Server Error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/ErrorResponse"
+                                }
+                            }
+                        }
+                    },
                     "400": {
                         "description": "Bad Request",
                         "content": {
@@ -4777,6 +4857,16 @@
                             }
                         }
                     },
+                    "502": {
+                        "description": "Bad Gateway",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/ErrorResponse"
+                                }
+                            }
+                        }
+                    },
                     "403": {
                         "description": "Forbidden",
                         "content": {
@@ -4787,6 +4877,16 @@
                             }
                         }
                     },
+                    "401": {
+                        "description": "Unauthorized",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/ErrorResponse"
+                                }
+                            }
+                        }
+                    },
                     "408": {
                         "description": "Request Timeout",
                         "content": {
@@ -4874,8 +4974,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4884,8 +4984,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4894,8 +4994,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4904,8 +5004,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4914,8 +5014,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4975,8 +5075,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4985,8 +5085,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4995,8 +5095,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5005,8 +5105,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5015,8 +5115,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5090,8 +5190,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5100,8 +5200,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5110,8 +5210,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5120,8 +5220,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5130,8 +5230,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5190,8 +5290,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5200,8 +5300,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5210,8 +5310,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5220,8 +5320,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5230,8 +5330,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5288,8 +5388,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5298,8 +5398,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5308,8 +5408,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5318,8 +5418,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5328,8 +5428,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5391,8 +5491,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5401,8 +5501,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5411,8 +5511,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5421,8 +5521,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5431,8 +5531,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5563,8 +5663,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5573,8 +5673,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5583,8 +5683,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5593,8 +5693,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5603,8 +5703,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5666,8 +5766,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5676,8 +5776,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5686,8 +5786,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5696,8 +5796,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5706,8 +5806,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5838,8 +5938,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5848,8 +5948,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5858,8 +5958,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5868,8 +5968,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5878,8 +5978,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5941,8 +6041,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5951,8 +6051,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5961,8 +6061,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5971,8 +6071,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -5981,8 +6081,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6041,8 +6141,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6051,8 +6151,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6061,8 +6161,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6071,8 +6171,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6081,8 +6181,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6178,8 +6278,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6188,8 +6288,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6198,8 +6298,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6208,8 +6308,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6218,8 +6318,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6281,8 +6381,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6291,8 +6391,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6301,8 +6401,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6311,8 +6411,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6321,8 +6421,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6418,8 +6518,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6428,8 +6528,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6438,8 +6538,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6448,8 +6548,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6458,8 +6558,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6546,8 +6646,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6556,8 +6656,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6566,8 +6666,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6576,8 +6676,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6586,8 +6686,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6710,8 +6810,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6720,8 +6820,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6730,8 +6830,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6740,8 +6840,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6750,8 +6850,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6802,8 +6902,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6812,8 +6912,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6822,8 +6922,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6832,8 +6932,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6842,8 +6942,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6913,8 +7013,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6923,8 +7023,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6933,8 +7033,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6943,8 +7043,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -6953,8 +7053,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7005,8 +7105,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7015,8 +7115,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7025,8 +7125,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7035,8 +7135,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7045,8 +7145,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7188,8 +7288,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7198,8 +7298,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7208,8 +7308,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7218,8 +7318,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7228,8 +7328,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7291,8 +7391,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7301,8 +7401,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7311,8 +7411,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7321,8 +7421,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7331,8 +7431,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7450,8 +7550,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7460,8 +7560,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7470,8 +7570,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7480,8 +7580,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7490,8 +7590,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7570,13 +7670,24 @@
                             "type": "string"
                         }
                     },
+                    {
+                        "name": "serviceTemplateId",
+                        "in": "query",
+                        "description": "Id of the serviceTemplate",
+                        "required": false,
+                        "schema": {
+                            "type": "string",
+                            "format": "uuid"
+                        }
+                    },
                     {
                         "name": "serviceId",
                         "in": "query",
                         "description": "Id of the deployed service",
                         "required": false,
                         "schema": {
-                            "type": "string"
+                            "type": "string",
+                            "format": "uuid"
                         }
                     }
                 ],
@@ -7591,8 +7702,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7601,8 +7712,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7611,8 +7722,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7621,8 +7732,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7631,8 +7742,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7715,8 +7826,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7725,8 +7836,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7735,8 +7846,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7745,8 +7856,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7755,8 +7866,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7845,8 +7956,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7855,8 +7966,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7865,8 +7976,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7875,8 +7986,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7885,8 +7996,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7959,8 +8070,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7969,8 +8080,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7979,8 +8090,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7989,8 +8100,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -7999,8 +8110,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8124,8 +8235,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8134,8 +8245,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8144,8 +8255,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8154,8 +8265,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8164,8 +8275,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8235,8 +8346,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8245,8 +8356,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8255,8 +8366,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8265,8 +8376,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8275,8 +8386,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8334,8 +8445,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8344,8 +8455,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8354,8 +8465,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8364,8 +8475,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8374,8 +8485,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8443,8 +8554,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8453,8 +8564,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8463,8 +8574,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8473,8 +8584,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8483,8 +8594,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8503,9 +8614,6 @@
                             }
                         }
                     },
-                    "204": {
-                        "description": "no pending configuration update requests"
-                    },
                     "200": {
                         "description": "pending configuration update request details",
                         "content": {
@@ -8515,6 +8623,9 @@
                                 }
                             }
                         }
+                    },
+                    "204": {
+                        "description": "no pending configuration update requests"
                     }
                 }
             }
@@ -8555,8 +8666,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8565,8 +8676,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8575,8 +8686,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8585,8 +8696,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8595,8 +8706,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8644,8 +8755,8 @@
                             }
                         }
                     },
-                    "502": {
-                        "description": "Bad Gateway",
+                    "400": {
+                        "description": "Bad Request",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8654,8 +8765,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Unauthorized",
+                    "422": {
+                        "description": "Unprocessable Entity",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8664,8 +8775,8 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
+                    "502": {
+                        "description": "Bad Gateway",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8674,8 +8785,8 @@
                             }
                         }
                     },
-                    "422": {
-                        "description": "Unprocessable Entity",
+                    "403": {
+                        "description": "Forbidden",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8684,8 +8795,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "Forbidden",
+                    "401": {
+                        "description": "Unauthorized",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -8737,7 +8848,7 @@
                             }
                         }
                     },
-                    "502": {
+                    "400": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8747,7 +8858,7 @@
                             }
                         }
                     },
-                    "401": {
+                    "422": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8757,7 +8868,7 @@
                             }
                         }
                     },
-                    "400": {
+                    "502": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8767,7 +8878,7 @@
                             }
                         }
                     },
-                    "422": {
+                    "403": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8777,7 +8888,7 @@
                             }
                         }
                     },
-                    "403": {
+                    "401": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8837,7 +8948,7 @@
                             }
                         }
                     },
-                    "502": {
+                    "400": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8847,7 +8958,7 @@
                             }
                         }
                     },
-                    "401": {
+                    "422": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8857,7 +8968,7 @@
                             }
                         }
                     },
-                    "400": {
+                    "502": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8867,7 +8978,7 @@
                             }
                         }
                     },
-                    "422": {
+                    "403": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -8877,7 +8988,7 @@
                             }
                         }
                     },
-                    "403": {
+                    "401": {
                         "description": "",
                         "content": {
                             "application/json": {
@@ -10938,6 +11049,220 @@
                 },
                 "description": "Details of the service configuration."
             },
+            "EndUserFlavors": {
+                "required": [
+                    "isDowngradeAllowed",
+                    "modificationImpact",
+                    "name",
+                    "priority",
+                    "properties",
+                    "serviceFlavors"
+                ],
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string",
+                        "description": "The flavor name"
+                    },
+                    "properties": {
+                        "type": "object",
+                        "additionalProperties": {
+                            "type": "string",
+                            "description": "The properties of the flavor"
+                        },
+                        "description": "The properties of the flavor"
+                    },
+                    "priority": {
+                        "minimum": 1,
+                        "type": "integer",
+                        "description": "The priority of the flavor. The larger value means lower priority.",
+                        "format": "int32"
+                    },
+                    "features": {
+                        "type": "array",
+                        "description": "Important features and differentiators of the flavor.",
+                        "items": {
+                            "type": "string",
+                            "description": "Important features and differentiators of the flavor."
+                        }
+                    },
+                    "serviceFlavors": {
+                        "type": "array",
+                        "description": "The flavors of the orderable service.",
+                        "items": {
+                            "$ref": "#/components/schemas/ServiceFlavor"
+                        }
+                    },
+                    "modificationImpact": {
+                        "$ref": "#/components/schemas/ModificationImpact"
+                    },
+                    "isDowngradeAllowed": {
+                        "type": "boolean",
+                        "description": "Whether the downgrading is allowed, default value: true."
+                    },
+                    "downgradeAllowed": {
+                        "type": "boolean"
+                    }
+                },
+                "description": "The flavors of the orderable service."
+            },
+            "ServiceFlavor": {
+                "required": ["name", "priority", "properties"],
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string",
+                        "description": "The flavor name"
+                    },
+                    "properties": {
+                        "type": "object",
+                        "additionalProperties": {
+                            "type": "string",
+                            "description": "The properties of the flavor"
+                        },
+                        "description": "The properties of the flavor"
+                    },
+                    "priority": {
+                        "minimum": 1,
+                        "type": "integer",
+                        "description": "The priority of the flavor. The larger value means lower priority.",
+                        "format": "int32"
+                    },
+                    "features": {
+                        "type": "array",
+                        "description": "Important features and differentiators of the flavor.",
+                        "items": {
+                            "type": "string",
+                            "description": "Important features and differentiators of the flavor."
+                        }
+                    }
+                },
+                "description": "The flavors of the orderable service."
+            },
+            "UserOrderableServiceVo": {
+                "required": [
+                    "billing",
+                    "category",
+                    "csp",
+                    "description",
+                    "flavors",
+                    "icon",
+                    "name",
+                    "regions",
+                    "serviceHostingType",
+                    "serviceProviderContactDetails",
+                    "serviceTemplateId",
+                    "variables",
+                    "version"
+                ],
+                "type": "object",
+                "properties": {
+                    "serviceTemplateId": {
+                        "type": "string",
+                        "description": "The id of the orderable service.",
+                        "format": "uuid"
+                    },
+                    "category": {
+                        "type": "string",
+                        "description": "The category of the orderable service.",
+                        "enum": [
+                            "ai",
+                            "compute",
+                            "container",
+                            "storage",
+                            "network",
+                            "database",
+                            "mediaService",
+                            "security",
+                            "middleware",
+                            "others"
+                        ]
+                    },
+                    "name": {
+                        "type": "string",
+                        "description": "The name of the orderable service."
+                    },
+                    "version": {
+                        "type": "string",
+                        "description": "The version of the orderable service."
+                    },
+                    "csp": {
+                        "type": "string",
+                        "description": "The Cloud Service Provider of the orderable service.",
+                        "enum": [
+                            "HuaweiCloud",
+                            "FlexibleEngine",
+                            "OpenstackTestlab",
+                            "PlusServer",
+                            "RegioCloud",
+                            "AlibabaCloud",
+                            "aws",
+                            "azure",
+                            "GoogleCloudPlatform"
+                        ]
+                    },
+                    "regions": {
+                        "type": "array",
+                        "description": "The regions of the Cloud Service Provider.",
+                        "items": {
+                            "$ref": "#/components/schemas/Region"
+                        }
+                    },
+                    "description": {
+                        "type": "string",
+                        "description": "The description of the orderable service."
+                    },
+                    "icon": {
+                        "type": "string",
+                        "description": "The icon of the orderable service."
+                    },
+                    "variables": {
+                        "type": "array",
+                        "description": "The variables for the deployment, which will be passed to the deployer.",
+                        "items": {
+                            "$ref": "#/components/schemas/DeployVariable"
+                        }
+                    },
+                    "flavors": {
+                        "$ref": "#/components/schemas/EndUserFlavors"
+                    },
+                    "billing": {
+                        "$ref": "#/components/schemas/Billing"
+                    },
+                    "serviceHostingType": {
+                        "type": "string",
+                        "description": "Defines which cloud service account is used for deploying cloud resources.",
+                        "enum": ["self", "service-vendor"]
+                    },
+                    "serviceProviderContactDetails": {
+                        "$ref": "#/components/schemas/ServiceProviderContactDetails"
+                    },
+                    "serviceAvailabilityConfig": {
+                        "type": "array",
+                        "description": "The list of availability zone configuration of the service.",
+                        "items": {
+                            "$ref": "#/components/schemas/AvailabilityZoneConfig"
+                        }
+                    },
+                    "eula": {
+                        "type": "string",
+                        "description": "End user license agreement content of the service."
+                    },
+                    "configurationParameters": {
+                        "type": "array",
+                        "description": "The collection of service configuration parameters.",
+                        "items": {
+                            "$ref": "#/components/schemas/ServiceConfigurationParameter"
+                        }
+                    },
+                    "links": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/components/schemas/Link"
+                        }
+                    }
+                }
+            },
             "DeployResource": {
                 "required": ["groupName", "groupType", "properties", "resourceId", "resourceKind", "resourceName"],
                 "type": "object",
@@ -11036,9 +11361,8 @@
                         "type": "string",
                         "description": "The id of the workflow."
                     },
-                    "errorMsg": {
-                        "type": "string",
-                        "description": "The error message if the service order task failed."
+                    "errorResponse": {
+                        "$ref": "#/components/schemas/ErrorResponse"
                     },
                     "userId": {
                         "type": "string",
@@ -11669,220 +11993,6 @@
                     }
                 }
             },
-            "EndUserFlavors": {
-                "required": [
-                    "isDowngradeAllowed",
-                    "modificationImpact",
-                    "name",
-                    "priority",
-                    "properties",
-                    "serviceFlavors"
-                ],
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string",
-                        "description": "The flavor name"
-                    },
-                    "properties": {
-                        "type": "object",
-                        "additionalProperties": {
-                            "type": "string",
-                            "description": "The properties of the flavor"
-                        },
-                        "description": "The properties of the flavor"
-                    },
-                    "priority": {
-                        "minimum": 1,
-                        "type": "integer",
-                        "description": "The priority of the flavor. The larger value means lower priority.",
-                        "format": "int32"
-                    },
-                    "features": {
-                        "type": "array",
-                        "description": "Important features and differentiators of the flavor.",
-                        "items": {
-                            "type": "string",
-                            "description": "Important features and differentiators of the flavor."
-                        }
-                    },
-                    "serviceFlavors": {
-                        "type": "array",
-                        "description": "The flavors of the orderable service.",
-                        "items": {
-                            "$ref": "#/components/schemas/ServiceFlavor"
-                        }
-                    },
-                    "modificationImpact": {
-                        "$ref": "#/components/schemas/ModificationImpact"
-                    },
-                    "isDowngradeAllowed": {
-                        "type": "boolean",
-                        "description": "Whether the downgrading is allowed, default value: true."
-                    },
-                    "downgradeAllowed": {
-                        "type": "boolean"
-                    }
-                },
-                "description": "The flavors of the orderable service."
-            },
-            "ServiceFlavor": {
-                "required": ["name", "priority", "properties"],
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string",
-                        "description": "The flavor name"
-                    },
-                    "properties": {
-                        "type": "object",
-                        "additionalProperties": {
-                            "type": "string",
-                            "description": "The properties of the flavor"
-                        },
-                        "description": "The properties of the flavor"
-                    },
-                    "priority": {
-                        "minimum": 1,
-                        "type": "integer",
-                        "description": "The priority of the flavor. The larger value means lower priority.",
-                        "format": "int32"
-                    },
-                    "features": {
-                        "type": "array",
-                        "description": "Important features and differentiators of the flavor.",
-                        "items": {
-                            "type": "string",
-                            "description": "Important features and differentiators of the flavor."
-                        }
-                    }
-                },
-                "description": "The flavors of the orderable service."
-            },
-            "UserOrderableServiceVo": {
-                "required": [
-                    "billing",
-                    "category",
-                    "csp",
-                    "description",
-                    "flavors",
-                    "icon",
-                    "name",
-                    "regions",
-                    "serviceHostingType",
-                    "serviceProviderContactDetails",
-                    "serviceTemplateId",
-                    "variables",
-                    "version"
-                ],
-                "type": "object",
-                "properties": {
-                    "serviceTemplateId": {
-                        "type": "string",
-                        "description": "The id of the orderable service.",
-                        "format": "uuid"
-                    },
-                    "category": {
-                        "type": "string",
-                        "description": "The category of the orderable service.",
-                        "enum": [
-                            "ai",
-                            "compute",
-                            "container",
-                            "storage",
-                            "network",
-                            "database",
-                            "mediaService",
-                            "security",
-                            "middleware",
-                            "others"
-                        ]
-                    },
-                    "name": {
-                        "type": "string",
-                        "description": "The name of the orderable service."
-                    },
-                    "version": {
-                        "type": "string",
-                        "description": "The version of the orderable service."
-                    },
-                    "csp": {
-                        "type": "string",
-                        "description": "The Cloud Service Provider of the orderable service.",
-                        "enum": [
-                            "HuaweiCloud",
-                            "FlexibleEngine",
-                            "OpenstackTestlab",
-                            "PlusServer",
-                            "RegioCloud",
-                            "AlibabaCloud",
-                            "aws",
-                            "azure",
-                            "GoogleCloudPlatform"
-                        ]
-                    },
-                    "regions": {
-                        "type": "array",
-                        "description": "The regions of the Cloud Service Provider.",
-                        "items": {
-                            "$ref": "#/components/schemas/Region"
-                        }
-                    },
-                    "description": {
-                        "type": "string",
-                        "description": "The description of the orderable service."
-                    },
-                    "icon": {
-                        "type": "string",
-                        "description": "The icon of the orderable service."
-                    },
-                    "variables": {
-                        "type": "array",
-                        "description": "The variables for the deployment, which will be passed to the deployer.",
-                        "items": {
-                            "$ref": "#/components/schemas/DeployVariable"
-                        }
-                    },
-                    "flavors": {
-                        "$ref": "#/components/schemas/EndUserFlavors"
-                    },
-                    "billing": {
-                        "$ref": "#/components/schemas/Billing"
-                    },
-                    "serviceHostingType": {
-                        "type": "string",
-                        "description": "Defines which cloud service account is used for deploying cloud resources.",
-                        "enum": ["self", "service-vendor"]
-                    },
-                    "serviceProviderContactDetails": {
-                        "$ref": "#/components/schemas/ServiceProviderContactDetails"
-                    },
-                    "serviceAvailabilityConfig": {
-                        "type": "array",
-                        "description": "The list of availability zone configuration of the service.",
-                        "items": {
-                            "$ref": "#/components/schemas/AvailabilityZoneConfig"
-                        }
-                    },
-                    "eula": {
-                        "type": "string",
-                        "description": "End user license agreement content of the service."
-                    },
-                    "configurationParameters": {
-                        "type": "array",
-                        "description": "The collection of service configuration parameters.",
-                        "items": {
-                            "$ref": "#/components/schemas/ServiceConfigurationParameter"
-                        }
-                    },
-                    "links": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/components/schemas/Link"
-                        }
-                    }
-                }
-            },
             "ServiceConfigurationChangeRequest": {
                 "type": "object",
                 "properties": {
diff --git a/src/xpanse-api/generated/sdk.gen.ts b/src/xpanse-api/generated/sdk.gen.ts
index 6d2ec8d21..792b8e457 100644
--- a/src/xpanse-api/generated/sdk.gen.ts
+++ b/src/xpanse-api/generated/sdk.gen.ts
@@ -81,6 +81,8 @@ import type {
     GetMetricsResponse,
     GetOrderableServiceDetailsByIdData,
     GetOrderableServiceDetailsByIdResponse,
+    GetOrderableServiceDetailsByServiceIdData,
+    GetOrderableServiceDetailsByServiceIdResponse,
     GetOrderableServicesData,
     GetOrderableServicesResponse,
     GetOrderDetailsByOrderIdData,
@@ -1388,6 +1390,34 @@ export const queryTasks = (data: QueryTasksData = {}): CancelablePromise<QueryTa
     });
 };
 
+/**
+ * Get service template details by service id.<br> Required role: <b>admin</b> or <b>isv</b> or <b>user</b> </br>
+ * @param data The data for the request.
+ * @param data.serviceId The id of deployed service.
+ * @returns UserOrderableServiceVo OK
+ * @throws ApiError
+ */
+export const getOrderableServiceDetailsByServiceId = (
+    data: GetOrderableServiceDetailsByServiceIdData
+): CancelablePromise<GetOrderableServiceDetailsByServiceIdResponse> => {
+    return __request(OpenAPI, {
+        method: 'GET',
+        url: '/xpanse/services/{serviceId}/service_template',
+        path: {
+            serviceId: data.serviceId,
+        },
+        errors: {
+            400: 'Bad Request',
+            401: 'Unauthorized',
+            403: 'Forbidden',
+            408: 'Request Timeout',
+            422: 'Unprocessable Entity',
+            500: 'Internal Server Error',
+            502: 'Bad Gateway',
+        },
+    });
+};
+
 /**
  * List compute resources of the service.<br> Required role: <b>admin</b> or <b>user</b> </br>
  * @param data The data for the request.
@@ -2104,6 +2134,7 @@ export const getExistingResourceNamesWithKind = (
  * @param data.cspName name of the cloud service provider
  * @param data.siteName site of the region belongs to
  * @param data.regionName name of the region
+ * @param data.serviceTemplateId Id of the serviceTemplate
  * @param data.serviceId Id of the deployed service
  * @returns string OK
  * @throws ApiError
@@ -2118,6 +2149,7 @@ export const getAvailabilityZones = (
             cspName: data.cspName,
             siteName: data.siteName,
             regionName: data.regionName,
+            serviceTemplateId: data.serviceTemplateId,
             serviceId: data.serviceId,
         },
         errors: {
diff --git a/src/xpanse-api/generated/types.gen.ts b/src/xpanse-api/generated/types.gen.ts
index 2af272818..1e32f6262 100644
--- a/src/xpanse-api/generated/types.gen.ts
+++ b/src/xpanse-api/generated/types.gen.ts
@@ -2066,10 +2066,7 @@ export type ServiceOrderDetails = {
      * The id of the workflow.
      */
     workflowId?: string;
-    /**
-     * The error message if the service order task failed.
-     */
-    errorMsg?: string;
+    errorResponse?: ErrorResponse;
     /**
      * The id of the user who created the service order.
      */
@@ -3246,6 +3243,15 @@ export type QueryTasksData = {
 
 export type QueryTasksResponse = Array<WorkFlowTask>;
 
+export type GetOrderableServiceDetailsByServiceIdData = {
+    /**
+     * The id of deployed service.
+     */
+    serviceId: string;
+};
+
+export type GetOrderableServiceDetailsByServiceIdResponse = UserOrderableServiceVo;
+
 export type GetComputeResourceInventoryOfServiceData = {
     /**
      * Id of the deployed service
@@ -3749,6 +3755,10 @@ export type GetAvailabilityZonesData = {
      * Id of the deployed service
      */
     serviceId?: string;
+    /**
+     * Id of the serviceTemplate
+     */
+    serviceTemplateId?: string;
     /**
      * site of the region belongs to
      */