diff --git a/AuthenticatorShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift b/AuthenticatorShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift
index 6f6274dea4..8454688413 100644
--- a/AuthenticatorShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift
+++ b/AuthenticatorShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift
@@ -20,6 +20,22 @@ class MockCryptoClient: CryptoClientProtocol {
     var enrollAdminPasswordPublicKey: String?
     var enrollAdminPasswordResetResult: Result<String, Error> = .success("RESET_PASSWORD_KEY")
 
+    var enrollPinPin: String?
+    var enrollPinResult: Result<EnrollPinResponse, Error> = .success(
+        EnrollPinResponse(
+            pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
+            userKeyEncryptedPin: "userKeyEncryptedPin"
+        )
+    )
+
+    var enrollPinWithEncryptedPinEncryptedPin: String?
+    var enrollPinWithEncryptedPinResult: Result<EnrollPinResponse, Error> = .success(
+        EnrollPinResponse(
+            pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
+            userKeyEncryptedPin: "userKeyEncryptedPin"
+        )
+    )
+
     var getUserEncryptionKeyResult: Result<String, Error> = .success("USER_ENCRYPTION_KEY")
 
     var initializeOrgCryptoRequest: InitOrgCryptoRequest?
@@ -55,6 +71,16 @@ class MockCryptoClient: CryptoClientProtocol {
         return try enrollAdminPasswordResetResult.get()
     }
 
+    func enrollPin(pin: String) throws -> EnrollPinResponse {
+        enrollPinPin = pin
+        return try enrollPinResult.get()
+    }
+
+    func enrollPinWithEncryptedPin(encryptedPin: EncString) throws -> EnrollPinResponse {
+        enrollPinWithEncryptedPinEncryptedPin = encryptedPin
+        return try enrollPinWithEncryptedPinResult.get()
+    }
+
     func getUserEncryptionKey() async throws -> String {
         try getUserEncryptionKeyResult.get()
     }
diff --git a/Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 78a2995fef..e7ece36fb3 100644
--- a/Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -123,7 +123,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/bitwarden/sdk-swift",
       "state" : {
-        "revision" : "fe0f17e2c217497fe83e40c8dca324880070dea9"
+        "revision" : "bb36b4848c5006b4c14f53c07476d12e6f8708ef"
       }
     },
     {
diff --git a/BitwardenShared/Core/Auth/Repositories/AuthRepository.swift b/BitwardenShared/Core/Auth/Repositories/AuthRepository.swift
index 65a6135ec2..62840a3abf 100644
--- a/BitwardenShared/Core/Auth/Repositories/AuthRepository.swift
+++ b/BitwardenShared/Core/Auth/Repositories/AuthRepository.swift
@@ -1108,7 +1108,8 @@ extension DefaultAuthRepository: AuthRepository {
         case .decryptedKey,
              .deviceKey,
              .keyConnector,
-             .pin:
+             .pin,
+             .pinEnvelope: // TODO: PM-23289 will change in this ticket
             // No-op: nothing extra to do.
             break
         }
@@ -1195,7 +1196,8 @@ extension DefaultAuthRepository: AuthRepository {
         case .authRequest,
              .deviceKey,
              .keyConnector,
-             .pin:
+             .pin,
+             .pinEnvelope: // TODO: PM-23289 will change in this ticket
             break
         case .decryptedKey,
              .password:
diff --git a/BitwardenShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift b/BitwardenShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift
index 5d4243eacb..e3bc5b650c 100644
--- a/BitwardenShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift
+++ b/BitwardenShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift
@@ -20,6 +20,22 @@ class MockCryptoClient: CryptoClientProtocol {
     var enrollAdminPasswordPublicKey: String?
     var enrollAdminPasswordResetResult: Result<String, Error> = .success("RESET_PASSWORD_KEY")
 
+    var enrollPinPin: String?
+    var enrollPinResult: Result<EnrollPinResponse, Error> = .success(
+        EnrollPinResponse(
+            pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
+            userKeyEncryptedPin: "userKeyEncryptedPin"
+        )
+    )
+
+    var enrollPinWithEncryptedPinEncryptedPin: String?
+    var enrollPinWithEncryptedPinResult: Result<EnrollPinResponse, Error> = .success(
+        EnrollPinResponse(
+            pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
+            userKeyEncryptedPin: "userKeyEncryptedPin"
+        )
+    )
+
     var getUserEncryptionKeyCalled = false
     var getUserEncryptionKeyResult: Result<String, Error> = .success("USER_ENCRYPTION_KEY")
 
@@ -56,6 +72,16 @@ class MockCryptoClient: CryptoClientProtocol {
         return try enrollAdminPasswordResetResult.get()
     }
 
+    func enrollPin(pin: String) throws -> EnrollPinResponse {
+        enrollPinPin = pin
+        return try enrollPinResult.get()
+    }
+
+    func enrollPinWithEncryptedPin(encryptedPin: EncString) throws -> EnrollPinResponse {
+        enrollPinWithEncryptedPinEncryptedPin = encryptedPin
+        return try enrollPinWithEncryptedPinResult.get()
+    }
+
     func getUserEncryptionKey() async throws -> String {
         getUserEncryptionKeyCalled = true
         return try getUserEncryptionKeyResult.get()
diff --git a/project-common.yml b/project-common.yml
index 475bfe587d..4cf3dc5866 100644
--- a/project-common.yml
+++ b/project-common.yml
@@ -7,16 +7,14 @@ options:
   usesTabs: false
   indentWidth: 4
   tabWidth: 4
-
 include:
   - path: Configs/local-sdk.yml
     relativePaths: false
     enable: ${LOCAL_SDK}
-
 packages:
   BitwardenSdk:
     url: https://github.com/bitwarden/sdk-swift
-    revision: fe0f17e2c217497fe83e40c8dca324880070dea9
+    revision: bb36b4848c5006b4c14f53c07476d12e6f8708ef # 1.0.0-283-7b5d9db
     branch: unstable
   Firebase:
     url: https://github.com/firebase/firebase-ios-sdk