diff --git a/app/App.tsx b/app/App.tsx
index 86d1d5d0..3b46e885 100644
--- a/app/App.tsx
+++ b/app/App.tsx
@@ -16,6 +16,7 @@ import {
   ContainerProvider,
   MainContainer,
   InactivityWrapper,
+  OpenIDCredentialRecordProvider,
 } from '@hyperledger/aries-bifold-core'
 import { useNavigation } from '@react-navigation/native'
 import React, { useEffect, useState, useMemo } from 'react'
@@ -65,41 +66,43 @@ const App = () => {
     <ContainerProvider value={bcwContainer}>
       <StoreProvider initialState={initialState} reducer={reducer}>
         <AgentProvider agent={undefined}>
-          <ThemeProvider value={theme}>
-            <AnimatedComponentsProvider value={animatedComponents}>
-              <AuthProvider>
-                <NetworkProvider>
-                  <InactivityWrapper>
-                    <StatusBar
-                      barStyle="light-content"
-                      hidden={false}
-                      backgroundColor={theme.ColorPallet.brand.primary}
-                      translucent={false}
-                    />
-                    <NetInfo />
-                    <ErrorModal />
-                    <WebDisplay
-                      destinationUrl={surveyMonkeyUrl}
-                      exitUrl={surveyMonkeyExitUrl}
-                      visible={appState.showSurvey}
-                      onClose={() => setAppState({ showSurvey: false })}
-                    />
-                    <TourProvider
-                      homeTourSteps={homeTourSteps}
-                      credentialsTourSteps={credentialsTourSteps}
-                      credentialOfferTourSteps={credentialOfferTourSteps}
-                      proofRequestTourSteps={proofRequestTourSteps}
-                      overlayColor={'black'}
-                      overlayOpacity={0.7}
-                    >
-                      <RootStack />
-                    </TourProvider>
-                    <Toast topOffset={15} config={toastConfig} />
-                  </InactivityWrapper>
-                </NetworkProvider>
-              </AuthProvider>
-            </AnimatedComponentsProvider>
-          </ThemeProvider>
+          <OpenIDCredentialRecordProvider>
+            <ThemeProvider value={theme}>
+              <AnimatedComponentsProvider value={animatedComponents}>
+                <AuthProvider>
+                  <NetworkProvider>
+                    <InactivityWrapper>
+                      <StatusBar
+                        barStyle="light-content"
+                        hidden={false}
+                        backgroundColor={theme.ColorPallet.brand.primary}
+                        translucent={false}
+                      />
+                      <NetInfo />
+                      <ErrorModal />
+                      <WebDisplay
+                        destinationUrl={surveyMonkeyUrl}
+                        exitUrl={surveyMonkeyExitUrl}
+                        visible={appState.showSurvey}
+                        onClose={() => setAppState({ showSurvey: false })}
+                      />
+                      <TourProvider
+                        homeTourSteps={homeTourSteps}
+                        credentialsTourSteps={credentialsTourSteps}
+                        credentialOfferTourSteps={credentialOfferTourSteps}
+                        proofRequestTourSteps={proofRequestTourSteps}
+                        overlayColor={'black'}
+                        overlayOpacity={0.7}
+                      >
+                        <RootStack />
+                      </TourProvider>
+                      <Toast topOffset={15} config={toastConfig} />
+                    </InactivityWrapper>
+                  </NetworkProvider>
+                </AuthProvider>
+              </AnimatedComponentsProvider>
+            </ThemeProvider>
+          </OpenIDCredentialRecordProvider>
         </AgentProvider>
       </StoreProvider>
     </ContainerProvider>
diff --git a/app/container-imp.ts b/app/container-imp.ts
index d7027110..5bd549fb 100644
--- a/app/container-imp.ts
+++ b/app/container-imp.ts
@@ -21,6 +21,7 @@ import {
   testIdWithKey,
   PersistentStorage,
   PersistentState,
+  defaultConfig,
 } from '@hyperledger/aries-bifold-core'
 import { RemoteLogger, RemoteLoggerOptions } from '@hyperledger/aries-bifold-remote-logs'
 import { getProofRequestTemplates } from '@hyperledger/aries-bifold-verifier'
@@ -157,6 +158,7 @@ export class AppContainer implements Container {
       },
     ])
     this._container.registerInstance(TOKENS.CONFIG, {
+      ...defaultConfig,
       PINSecurity: { rules: PINRules, displayHelper: false },
       settings: [
         {
diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
index 16a7a4da..1712c005 100644
--- a/app/ios/Podfile.lock
+++ b/app/ios/Podfile.lock
@@ -445,7 +445,7 @@ PODS:
   - React-jsinspector (0.72.5)
   - React-logger (0.72.5):
     - glog
-  - "react-native-attestation (1.0.0-alpha.353+7257e199)":
+  - "react-native-attestation (1.0.0-alpha.359+3cd3556b)":
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-config (1.5.0):
@@ -936,7 +936,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a
   React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
   React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
-  react-native-attestation: 6e7fb59eb29b078162071fcc6c84752d2f88e1e4
+  react-native-attestation: e5d716b1b7d8ef61262539558589c99f2efff4bc
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-date-picker: 06a4d96ab525a163c7a90bccd68833d136b0bb13
   react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7
diff --git a/app/package.json b/app/package.json
index 0139f68f..ebe88a6c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -62,11 +62,11 @@
     "@formatjs/intl-relativetimeformat": "9.3.1",
     "@hyperledger/anoncreds-react-native": "0.2.4",
     "@hyperledger/aries-askar-react-native": "0.2.3",
-    "@hyperledger/aries-bifold-core": "1.0.0-alpha.353",
-    "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.353",
-    "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.353",
-    "@hyperledger/aries-oca": "1.0.0-alpha.353",
-    "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.353",
+    "@hyperledger/aries-bifold-core": "1.0.0-alpha.359",
+    "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.359",
+    "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.359",
+    "@hyperledger/aries-oca": "1.0.0-alpha.359",
+    "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.359",
     "@hyperledger/indy-vdr-react-native": "0.2.2",
     "@hyperledger/indy-vdr-shared": "0.2.2",
     "@react-native-async-storage/async-storage": "1.15.11",
diff --git a/yarn.lock b/yarn.lock
index 8105c76d..7ba013df 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3253,9 +3253,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.353":
-  version: 1.0.0-alpha.353
-  resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.353"
+"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.359":
+  version: 1.0.0-alpha.359
+  resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.359"
   peerDependencies:
     "@credo-ts/anoncreds": 0.5.11
     "@credo-ts/askar": 0.5.11
@@ -3330,13 +3330,13 @@ __metadata:
     uuid: ^9.0.0
   bin:
     bifold: bin/bifold
-  checksum: ff79d2462fbae56b06dd33fd0a97f440bf410d797b4552d9ee61e4c95b524183407f026cb86d77b3632617e9b4010cb948f8b6d0250684b9f3c9170c72a12f09
+  checksum: 816d0e214e9bbff297f187897606f39e1f0bff0de8c0c0a8d1ef71007cf4a3f7a07afba975098f46927549a2350da3f78842963c4daf80b87d55d47977325ffa
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.353":
-  version: 1.0.0-alpha.353
-  resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.353"
+"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.359":
+  version: 1.0.0-alpha.359
+  resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.359"
   peerDependencies:
     "@credo-ts/core": 0.5.11
     axios: ^1.4.0
@@ -3344,43 +3344,43 @@ __metadata:
     react: ^18.2.0
     react-native: ^0.72.5
     react-native-logs: ^5.1.0
-  checksum: 3b770f6acfa406c63098c41f87848e47bfd4ce1574154a0818dc8f2865485e39f442284e1a3eb92488511e7520596da23a322721ffd37d79e171cc051b41fb05
+  checksum: 892c3e94ff61233d9c7e5e08e224b52edbe40774c9214af26f8cdd12be3c9584a9de328b24e7e2bd606a67f0e0f2ffa8c68ce18ad45312f7f85df70975f6c3cc
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.353":
-  version: 1.0.0-alpha.353
-  resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.353"
+"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.359":
+  version: 1.0.0-alpha.359
+  resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.359"
   peerDependencies:
     "@credo-ts/anoncreds": 0.5.11
     "@credo-ts/core": 0.5.11
     "@credo-ts/react-hooks": ^0.6.0
     "@hyperledger/anoncreds-shared": 0.2.4
     react: ^18.2.0
-  checksum: 00b7cf4c454551f53e2fab40e04582dee42c9071b586ff35de23ef36f5749042a90f1e592985b3d1e27445db77a9e18881175a4d5276e19453152382f666388d
+  checksum: 4cfadc3840be6a65d847439541ee637d51eb54359d41e1e92720a2a47ff92c6a4f6009c4292c7573e7598260dfd92306d32bef6a6414e0b179b489d0c6a2f918
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-oca@npm:1.0.0-alpha.353":
-  version: 1.0.0-alpha.353
-  resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.353"
+"@hyperledger/aries-oca@npm:1.0.0-alpha.359":
+  version: 1.0.0-alpha.359
+  resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.359"
   dependencies:
     "@credo-ts/anoncreds": "npm:0.5.11"
     "@credo-ts/core": "npm:0.5.11"
     axios: "npm:^1.4.0"
     lodash.startcase: "npm:^4.4.0"
     react-native-fs: "npm:^2.16.6"
-  checksum: 11118cbced0bef3fcdcfee3d3f55fec0bceb580f972065201cbfa5a033af344493d620be2aefbfb8ab20dce800128f45d417851cb74ef4f99f8535f7870ee9b5
+  checksum: cfde414837c5f642e78b067a4f22681a1250622adfde9963f13f81fda8ba90a92a90852eb1504a868a43ab1e93f147c550c0713478b177cba3de5429e7554602
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.353":
-  version: 1.0.0-alpha.353
-  resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.353"
+"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.359":
+  version: 1.0.0-alpha.359
+  resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.359"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 4a0041c7cabe2632b0de4526ba1d7b63b04c0bb2b7f109f594e3e9cee338aaec12f971c6e21115308da85f606ec20389e19a6cf8f18e274bb158d29a622f0ebd
+  checksum: 04564855bf908539897256dff1aff420cd068b2665f42a8cbc69791999d1a34faac424ff6bae24b793c142591c31c881bdd609dc31a41e7072a77d9ab094a99b
   languageName: node
   linkType: hard
 
@@ -8291,11 +8291,11 @@ __metadata:
     "@formatjs/intl-relativetimeformat": "npm:9.3.1"
     "@hyperledger/anoncreds-react-native": "npm:0.2.4"
     "@hyperledger/aries-askar-react-native": "npm:0.2.3"
-    "@hyperledger/aries-bifold-core": "npm:1.0.0-alpha.353"
-    "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.353"
-    "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.353"
-    "@hyperledger/aries-oca": "npm:1.0.0-alpha.353"
-    "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.353"
+    "@hyperledger/aries-bifold-core": "npm:1.0.0-alpha.359"
+    "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.359"
+    "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.359"
+    "@hyperledger/aries-oca": "npm:1.0.0-alpha.359"
+    "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.359"
     "@hyperledger/indy-vdr-react-native": "npm:0.2.2"
     "@hyperledger/indy-vdr-shared": "npm:0.2.2"
     "@react-native-async-storage/async-storage": "npm:1.15.11"