diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7edce891c..e50890000 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@
   - **Breaking Change:** Remove `Backend` field and mark `Protection` field as required in `Key`, `CreateKeyPayload`, `CreateWrappingKeyPayload` and `WrappingKey` model
 - `ske`: [v1.4.0](services/ske/CHANGELOG.md#v140)
   - **Feature:** Add new field `Kubernetes` to `Nodepool` model
+- `serviceaccount`: [v0.11.1](services/serviceaccount/CHANGELOG.md#v0111)
+  - **Improvement:** Improve error handling for `CreateShortLivedAccessToken`
 - `stackitmarketplace`: [v1.8.0](services/stackitmarketplace/CHANGELOG.md#v180)
   - **Feature:** Add new field `FreeTrial` in `CatalogProductOverview` model
 
diff --git a/services/serviceaccount/CHANGELOG.md b/services/serviceaccount/CHANGELOG.md
index 403032655..1357d2925 100644
--- a/services/serviceaccount/CHANGELOG.md
+++ b/services/serviceaccount/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v0.11.1
+- **Improvement:** Improve error handling for `CreateShortLivedAccessToken`
+
 ## v0.11.0
 - **Feature:** Add new `Algorithm` field to `CreateServiceAccountKeyPayload` model with enum values `RSA_2048` and `RSA_4096`
 
@@ -5,7 +8,7 @@
 - **Feature:** Add new enum for Key Algorithm `RSA_4096`
 
 ## v0.9.1
-  - **Dependencies:** Bump `github.com/golang-jwt/jwt/v5` from `v5.2.2` to `v5.2.3`
+- **Dependencies:** Bump `github.com/golang-jwt/jwt/v5` from `v5.2.2` to `v5.2.3`
 
 ## v0.9.0
 - Add `required:"true"` tags to model structs
diff --git a/services/serviceaccount/VERSION b/services/serviceaccount/VERSION
index e88c34ff0..a5de145cc 100644
--- a/services/serviceaccount/VERSION
+++ b/services/serviceaccount/VERSION
@@ -1 +1 @@
-v0.11.0
\ No newline at end of file
+v0.11.1
\ No newline at end of file
diff --git a/services/serviceaccount/api_default.go b/services/serviceaccount/api_default.go
index cf555566d..01aa3f7e5 100644
--- a/services/serviceaccount/api_default.go
+++ b/services/serviceaccount/api_default.go
@@ -982,6 +982,27 @@ func (r CreateShortLivedAccessTokenRequest) Execute() (*CreateShortLivedAccessTo
 			Body:         localVarBody,
 			ErrorMessage: localVarHTTPResponse.Status,
 		}
+		if localVarHTTPResponse.StatusCode == 400 {
+			var v Error
+			err = client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.ErrorMessage = err.Error()
+				return localVarReturnValue, newErr
+			}
+			newErr.ErrorMessage = oapierror.FormatErrorMessage(localVarHTTPResponse.Status, &v)
+			newErr.Model = v
+			return localVarReturnValue, newErr
+		}
+		if localVarHTTPResponse.StatusCode == 403 {
+			var v AuthError
+			err = client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.ErrorMessage = err.Error()
+				return localVarReturnValue, newErr
+			}
+			newErr.ErrorMessage = oapierror.FormatErrorMessage(localVarHTTPResponse.Status, &v)
+			newErr.Model = v
+		}
 		return localVarReturnValue, newErr
 	}