diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
index 0569abd9d2..282ca747eb 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
@@ -14,8 +14,8 @@ import java.util.UUID
 private const val UNIQUE_APP_ID_KEY = "$BASE_KEY:appId"
 private const val REMEMBERED_EMAIL_ADDRESS_KEY = "$BASE_KEY:rememberedEmail"
 private const val STATE_KEY = "$BASE_KEY:state"
-private const val MASTER_KEY_ENCRYPTION_USER_KEY = "masterKeyEncryptedUserKey"
-private const val MASTER_KEY_ENCRYPTION_PRIVATE_KEY = "encPrivateKey"
+private const val MASTER_KEY_ENCRYPTION_USER_KEY = "$BASE_KEY:masterKeyEncryptedUserKey"
+private const val MASTER_KEY_ENCRYPTION_PRIVATE_KEY = "$BASE_KEY:encPrivateKey"
 
 /**
  * Primary implementation of [AuthDiskSource].
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt
index da6316a3e2..23943acb3f 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt
@@ -118,12 +118,13 @@ class AuthDiskSourceTest {
 
     @Test
     fun `getUserKey should pull from SharedPreferences`() {
+        val userKeyBaseKey = "bwPreferencesStorage:masterKeyEncryptedUserKey"
         val mockUserId = "mockUserId"
         val mockUserKey = "mockUserKey"
         fakeSharedPreferences
             .edit()
             .putString(
-                "masterKeyEncryptedUserKey_$mockUserId",
+                "${userKeyBaseKey}_$mockUserId",
                 mockUserKey,
             )
             .apply()
@@ -136,6 +137,7 @@ class AuthDiskSourceTest {
 
     @Test
     fun `storeUserKey should update SharedPreferences`() {
+        val userKeyBaseKey = "bwPreferencesStorage:masterKeyEncryptedUserKey"
         val mockUserId = "mockUserId"
         val mockUserKey = "mockUserKey"
         authDiskSource.storeUserKey(
@@ -144,7 +146,7 @@ class AuthDiskSourceTest {
         )
         val actual = fakeSharedPreferences
             .getString(
-                "masterKeyEncryptedUserKey_$mockUserId",
+                "${userKeyBaseKey}_$mockUserId",
                 null,
             )
         assertEquals(
@@ -155,12 +157,13 @@ class AuthDiskSourceTest {
 
     @Test
     fun `getPrivateKey should pull from SharedPreferences`() {
+        val privateKeyBaseKey = "bwPreferencesStorage:encPrivateKey"
         val mockUserId = "mockUserId"
         val mockPrivateKey = "mockPrivateKey"
         fakeSharedPreferences
             .edit()
             .putString(
-                "encPrivateKey_$mockUserId",
+                "${privateKeyBaseKey}_$mockUserId",
                 mockPrivateKey,
             )
             .apply()
@@ -173,6 +176,7 @@ class AuthDiskSourceTest {
 
     @Test
     fun `storePrivateKey should update SharedPreferences`() {
+        val privateKeyBaseKey = "bwPreferencesStorage:encPrivateKey"
         val mockUserId = "mockUserId"
         val mockPrivateKey = "mockPrivateKey"
         authDiskSource.storePrivateKey(
@@ -180,7 +184,7 @@ class AuthDiskSourceTest {
             privateKey = mockPrivateKey,
         )
         val actual = fakeSharedPreferences.getString(
-            "encPrivateKey_$mockUserId",
+            "${privateKeyBaseKey}_$mockUserId",
             null,
         )
         assertEquals(