diff --git a/boat-scaffold/src/main/templates/boat-swift5/APIs.mustache b/boat-scaffold/src/main/templates/boat-swift5/APIs.mustache
index e15ba5032..8dc94f139 100644
--- a/boat-scaffold/src/main/templates/boat-swift5/APIs.mustache
+++ b/boat-scaffold/src/main/templates/boat-swift5/APIs.mustache
@@ -5,8 +5,14 @@
 //
 
 import Foundation
+{{#useMsdkSwift}}
+import BackbaseSDK
+{{/useMsdkSwift}}
+{{^useMsdkSwift}}
 import Backbase
 import ClientCommonGen2
+{{/useMsdkSwift}}
+
 
 {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class {{moduleName}}Client: NSObject, DBSClient {
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var dataProvider: DBSDataProvider?
@@ -42,7 +48,12 @@ import ClientCommonGen2
         self.headers = headers
 
         addHeaders({{moduleName}}Client.customHeaders)
+        {{#useMsdkSwift}}
+        addHeaders(Backbase.authClient()?.tokens() ?? [:])
+        {{/useMsdkSwift}}
+        {{^useMsdkSwift}}
         addHeaders(Backbase.authClient().tokens())
+        {{/useMsdkSwift}}
     }
 
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addHeaders(_ aHeaders:[String:String]) {
diff --git a/boat-scaffold/src/main/templates/boat-swift5/Podfile.mustache b/boat-scaffold/src/main/templates/boat-swift5/Podfile.mustache
index ffe9e26f7..5188fdcc4 100644
--- a/boat-scaffold/src/main/templates/boat-swift5/Podfile.mustache
+++ b/boat-scaffold/src/main/templates/boat-swift5/Podfile.mustache
@@ -10,7 +10,12 @@ install! 'cocoapods', deterministic_uuids: false
 inhibit_all_warnings!
 
 def normal_pods
-  pod 'Backbase', '>= 9'{{#useRxSwift}}
+  {{#useMsdkSwift}}
+  pod 'BackbaseSDK'
+  {{/useMsdkSwift}}
+  {{^useMsdkSwift}}
+  pod 'Backbase', '>= 9'
+  {{/useMsdkSwift}}{{#useRxSwift}}
   pod 'RxSwift', '>= 5.0.0'{{/useRxSwift}}{{#useAlamofire}}
   pod 'Alamofire', '>= 4.9.1'{{/useAlamofire}}{{#usePromiseKit}}
   pod 'PromiseKit', '>= 6.12.0'{{/usePromiseKit}}
diff --git a/boat-scaffold/src/main/templates/boat-swift5/Podspec.mustache b/boat-scaffold/src/main/templates/boat-swift5/Podspec.mustache
index 487d1fc2d..efc4be729 100644
--- a/boat-scaffold/src/main/templates/boat-swift5/Podspec.mustache
+++ b/boat-scaffold/src/main/templates/boat-swift5/Podspec.mustache
@@ -21,8 +21,13 @@ Pod::Spec.new do |s|
   s.vendored_frameworks = '{{projectName}}.xcframework'
 
   # ――― Dependencies ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  {{#useMsdkSwift}}
+  s.dependency 'BackbaseSDK'
+  {{/useMsdkSwift}}
+  {{^useMsdkSwift}}
   s.dependency 'Backbase', '>= 9.0'
   s.dependency 'ClientCommonGen2', '>= 1.0'
+  {{/useMsdkSwift}}
   {{#usePromiseKit}}
   s.dependency 'PromiseKit/CorePromise', '>= 6.12.0'
   {{/usePromiseKit}}
diff --git a/boat-scaffold/src/main/templates/boat-swift5/api.mustache b/boat-scaffold/src/main/templates/boat-swift5/api.mustache
index dd356852b..52381839a 100644
--- a/boat-scaffold/src/main/templates/boat-swift5/api.mustache
+++ b/boat-scaffold/src/main/templates/boat-swift5/api.mustache
@@ -6,8 +6,14 @@
 //
 
 import Foundation
+{{#useMsdkSwift}}
+import BackbaseSDK
+{{/useMsdkSwift}}
+{{^useMsdkSwift}}
 import Backbase
-import ClientCommonGen2{{#usePromiseKit}}
+import ClientCommonGen2
+{{/useMsdkSwift}}
+{{#usePromiseKit}}
 import PromiseKit{{/usePromiseKit}}{{#useRxSwift}}
 import RxSwift{{/useRxSwift}}{{#useCombine}}
 import Combine{{/useCombine}}
@@ -48,7 +54,12 @@ extension {{moduleName}}Client {
 {{#description}}
 /** {{description}} */{{/description}}
 {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, DBSClient, {{classname}}Protocol {
+    {{#useMsdkSwift}}
+    public var dataProvider: BackbaseSDK.DBSDataProvider?
+    {{/useMsdkSwift}}
+    {{^useMsdkSwift}}
     public var dataProvider: DBSDataProvider?
+    {{/useMsdkSwift}}
     public var baseURL: URL
 
     public override init() {
@@ -189,7 +200,7 @@ extension {{moduleName}}Client {
         }
     }
 {{/useResult}}
-    
+
     /**
      {{#summary}}
      {{{summary}}}
@@ -252,12 +263,24 @@ extension {{moduleName}}Client {
         ]
         let headerParameters = APIHelper.rejectNilHeaders(nillableHeaders){{/-last}}{{/headerParams}}
         guard let url = urlComponents?.url else { throw CallError.invalidUrl }
+
+        {{#useMsdkSwift}}
+        let request = try BackbaseSDK.RequestBuilder.createURLRequest(requestUrl: url, 
+                                                                            method: "{{httpMethod}}",
+                                                                            queryParameters: {{#hasQueryParams}}queryParameters.compactMapValues({ $0 }){{/hasQueryParams}}{{^hasQueryParams}}nil{{/hasQueryParams}},
+                                                                            bodyParameters: parameters,
+                                                                            bodyType: {{#hasBodyParam}}{{^isMultipart}}.json{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{#isMultipart}}.multipartForm{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{^isMultipart}}.none{{/isMultipart}}{{/hasBodyParam}}{{#headerParams}}{{#-first}},
+                                                                            headers: headerParameters{{/-first}}{{/headerParams}})
+        {{/useMsdkSwift}}
+        {{^useMsdkSwift}}
         let request = try ClientCommonGen2.RequestBuilder.createURLRequest(requestUrl: url, 
                                                                             method: "{{httpMethod}}",
                                                                             queryParameters: {{#hasQueryParams}}queryParameters.compactMapValues({ $0 }){{/hasQueryParams}}{{^hasQueryParams}}nil{{/hasQueryParams}},
                                                                             bodyParameters: parameters,
                                                                             bodyType: {{#hasBodyParam}}{{^isMultipart}}.json{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{#isMultipart}}.multipartForm{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{^isMultipart}}.none{{/isMultipart}}{{/hasBodyParam}}{{#headerParams}}{{#-first}},
                                                                             headers: headerParameters{{/-first}}{{/headerParams}})
+        {{/useMsdkSwift}}
+
         return Call<{{#returnType}}{{#isResponseFile}}Data{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}NoResponse{{/returnType}}>(dataProvider: dataProvider, request: request)
     }
 {{/operation}}
diff --git a/boat-scaffold/src/main/templates/boat-swift5/api_parameters.mustache b/boat-scaffold/src/main/templates/boat-swift5/api_parameters.mustache
index 9a44eb60f..75a4b473b 100644
--- a/boat-scaffold/src/main/templates/boat-swift5/api_parameters.mustache
+++ b/boat-scaffold/src/main/templates/boat-swift5/api_parameters.mustache
@@ -8,7 +8,12 @@
 // https://openapi-generator.tech
 
 import Foundation
+{{#useMsdkSwift}}
+import BackbaseSDK
+{{/useMsdkSwift}}
+{{^useMsdkSwift}}
 import ClientCommonGen2
+{{/useMsdkSwift}}
 
 public extension {{classname}} {
 {{#operation}}
diff --git a/boat-scaffold/src/main/templates/boat-swift5/model.mustache b/boat-scaffold/src/main/templates/boat-swift5/model.mustache
index 183e63d8b..48264e135 100644
--- a/boat-scaffold/src/main/templates/boat-swift5/model.mustache
+++ b/boat-scaffold/src/main/templates/boat-swift5/model.mustache
@@ -6,7 +6,12 @@
 //
 
 import Foundation
+{{#useMsdkSwift}}
+import BackbaseSDK
+{{/useMsdkSwift}}
+{{^useMsdkSwift}}
 import ClientCommonGen2
+{{/useMsdkSwift}}
 
 {{#description}}
 /** {{description}} */{{/description}}