diff --git a/.env.sample b/.env.sample
index de40b461..bdf4bd32 100644
--- a/.env.sample
+++ b/.env.sample
@@ -9,3 +9,6 @@ OCA_URL=https://raw.githubusercontent.com/credebl/credebl-aries-oca-bundles/rele
 
 #BASE_URL
 PUBLIC_ORG=https://example.com
+
+#PROOF_TEMPLATE_URL
+PROOF_TEMPLATE_URL=
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 47870bb6..ccec0061 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -81,8 +81,8 @@ android {
         applicationId "id.credebl.adeya"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 6
-        versionName "1.0.3"
+        versionCode 8
+        versionName "1.0.5"
 
         missingDimensionStrategy 'react-native-camera', 'general'
     }
diff --git a/app/contexts/configuration.tsx b/app/contexts/configuration.tsx
index 56d23c92..8628a294 100644
--- a/app/contexts/configuration.tsx
+++ b/app/contexts/configuration.tsx
@@ -29,6 +29,7 @@ export interface ConfigurationContext {
   credentialEmptyList: React.FC<EmptyListProps>
   developer: React.FC
   OCABundleResolver: OCABundleResolverType
+  proofTemplateBaseUrl?: string
   scan: React.FC<ScanProps>
   useBiometry: React.FC
   record: React.FC<RecordProps>
@@ -39,7 +40,7 @@ export interface ConfigurationContext {
   useCustomNotifications: () => { total: number; notifications: any }
   connectionTimerDelay?: number
   autoRedirectConnectionToHome?: boolean
-  proofRequestTemplates?: Array<ProofRequestTemplate>
+  proofRequestTemplates?: () => Array<ProofRequestTemplate>
   enableTours?: boolean
   enableWalletNaming?: boolean
   enableBackupWallet?: boolean
diff --git a/app/contexts/store.tsx b/app/contexts/store.tsx
index 766d4468..c0d4d101 100644
--- a/app/contexts/store.tsx
+++ b/app/contexts/store.tsx
@@ -34,7 +34,7 @@ export const defaultState: State = {
     developerModeEnabled: false,
     biometryPreferencesUpdated: false,
     useBiometry: false,
-    useVerifierCapability: false,
+    useVerifierCapability: true,
     useConnectionInviterCapability: false,
     useDevVerifierTemplates: false,
     walletName: generateRandomWalletName(),
diff --git a/app/defaultConfiguration.ts b/app/defaultConfiguration.ts
index 9aff1f8c..14d51203 100644
--- a/app/defaultConfiguration.ts
+++ b/app/defaultConfiguration.ts
@@ -2,7 +2,7 @@ import { BrandingOverlayType, RemoteOCABundleResolver } from '@hyperledger/aries
 import { Config } from 'react-native-config'
 
 import defaultIndyLedgers from '../configs/ledgers/indy'
-import { defaultProofRequestTemplates } from '../verifier'
+import { useProofRequestTemplates } from '../verifier'
 
 import EmptyList from './components/misc/EmptyList'
 import Record from './components/record/Record'
@@ -30,6 +30,7 @@ export const defaultConfiguration: ConfigurationContext = {
     brandingOverlayType: BrandingOverlayType.Branding10,
     preLoad: true,
   }),
+  proofTemplateBaseUrl: Config.PROOF_TEMPLATE_URL ?? '',
   scan: Scan,
   useBiometry: UseBiometry,
   record: Record,
@@ -45,7 +46,7 @@ export const defaultConfiguration: ConfigurationContext = {
     pageTitle: '',
   },
   useCustomNotifications: useNotifications,
-  proofRequestTemplates: defaultProofRequestTemplates,
+  proofRequestTemplates: useProofRequestTemplates,
   enableTours: false,
   enableWalletNaming: true,
   enableBackupWallet: true,
diff --git a/app/hooks/proof-request-templates.ts b/app/hooks/proof-request-templates.ts
index 9e0edc71..eca7cf74 100644
--- a/app/hooks/proof-request-templates.ts
+++ b/app/hooks/proof-request-templates.ts
@@ -1,14 +1,36 @@
-import { useMemo } from 'react'
+import { useEffect, useState } from 'react'
 
 import { ProofRequestTemplate } from '../../verifier'
 import { useConfiguration } from '../contexts/configuration'
+import { applyTemplateMarkers, useRemoteProofBundleResolver } from '../utils/proofBundle'
 
 export const useTemplates = (): Array<ProofRequestTemplate> => {
-  const { proofRequestTemplates } = useConfiguration()
-  return proofRequestTemplates || []
+  const [proofRequestTemplates, setProofRequestTemplates] = useState<ProofRequestTemplate[]>([])
+  const { proofTemplateBaseUrl } = useConfiguration()
+  const resolver = useRemoteProofBundleResolver(proofTemplateBaseUrl)
+  const acceptDevCredentials = false
+  useEffect(() => {
+    resolver.resolve(acceptDevCredentials).then(templates => {
+      if (templates) {
+        setProofRequestTemplates(applyTemplateMarkers(templates))
+      }
+    })
+  }, [])
+  return proofRequestTemplates
 }
 
 export const useTemplate = (templateId: string): ProofRequestTemplate | undefined => {
-  const { proofRequestTemplates } = useConfiguration()
-  return useMemo(() => proofRequestTemplates?.find(template => template.id === templateId), [templateId])
+  const [proofRequestTemplate, setProofRequestTemplate] = useState<ProofRequestTemplate | undefined>(undefined)
+  const { proofTemplateBaseUrl } = useConfiguration()
+  const resolver = useRemoteProofBundleResolver(proofTemplateBaseUrl)
+  const acceptDevCredentials = false
+
+  useEffect(() => {
+    resolver.resolveById(templateId, acceptDevCredentials).then(template => {
+      if (template) {
+        setProofRequestTemplate(applyTemplateMarkers(template))
+      }
+    })
+  }, [])
+  return proofRequestTemplate
 }
diff --git a/app/screens/CredentialOfferAccept.tsx b/app/screens/CredentialOfferAccept.tsx
index 26c6c91d..b91e6dd5 100644
--- a/app/screens/CredentialOfferAccept.tsx
+++ b/app/screens/CredentialOfferAccept.tsx
@@ -147,7 +147,7 @@ const CredentialOfferAccept: React.FC<CredentialOfferAcceptProps> = ({ visible,
         </ScrollView>
 
         <View style={[styles.controlsContainer]}>
-          {credentialDeliveryStatus === DeliveryStatus.Pending && (
+          {credentialDeliveryStatus === DeliveryStatus.Pending && credential.state === CredentialState.RequestSent && (
             <View>
               <Button
                 title={t('Loading.BackToHome')}
diff --git a/app/screens/ListCredentials.tsx b/app/screens/ListCredentials.tsx
index 79a370b7..265b9bbe 100644
--- a/app/screens/ListCredentials.tsx
+++ b/app/screens/ListCredentials.tsx
@@ -78,7 +78,7 @@ const ListCredentials: React.FC = () => {
     updateCredentials().then(updatedCredentials => {
       setCredentialList(updatedCredentials)
     })
-  }, [])
+  }, [credentialList])
 
   return (
     <View style={styles.container}>
diff --git a/app/screens/ProofRequestDetails.tsx b/app/screens/ProofRequestDetails.tsx
index 855604c9..2d989d5a 100644
--- a/app/screens/ProofRequestDetails.tsx
+++ b/app/screens/ProofRequestDetails.tsx
@@ -1,4 +1,6 @@
-import { MetaOverlay, OverlayType } from '@hyperledger/aries-oca'
+import { MetaOverlay } from '@hyperledger/aries-oca'
+import { Attribute, Field, Predicate } from '@hyperledger/aries-oca/build/legacy'
+import { OverlayType } from '@hyperledger/aries-oca/build/types/TypeEnums'
 import { StackScreenProps } from '@react-navigation/stack'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -18,9 +20,8 @@ import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
 import { useTemplate } from '../hooks/proof-request-templates'
 import { Screens, ProofRequestsStackParams } from '../types/navigators'
-import { Attribute, Field, Predicate } from '../types/record'
 import { useAppAgent } from '../utils/agent'
-import { formatIfDate } from '../utils/helpers'
+import { formatIfDate, pTypeToText } from '../utils/helpers'
 import { buildFieldsFromAnonCredsProofRequestTemplate } from '../utils/oca'
 import { parseSchemaFromId } from '../utils/schema'
 import { testIdWithKey } from '../utils/testable'
@@ -53,14 +54,6 @@ const PredicateItem: React.FC<{
   onChangeValue: (name: string, value: string) => void
 }> = ({ item, style, onChangeValue }) => {
   const { ColorPallet } = useTheme()
-  const [pValue, setPValue] = useState(item.pValue)
-
-  useEffect(() => {
-    // can't format the date if parameterizable, must remain a number
-    if (!item.parameterizable) {
-      setPValue(formatIfDate(item.format, pValue))
-    }
-  }, [])
 
   const defaultStyle = StyleSheet.create({
     input: {
@@ -71,7 +64,7 @@ const PredicateItem: React.FC<{
   })
 
   return (
-    <View style={{ flexDirection: 'row' }}>
+    <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
       <Text style={style}>{item.label || item.name}</Text>
       <Text style={style}>{item.pType}</Text>
       {item.parameterizable && (
@@ -79,17 +72,17 @@ const PredicateItem: React.FC<{
           keyboardType="numeric"
           style={[style, defaultStyle.input]}
           onChangeText={value => onChangeValue(item.name || '', value)}>
-          {pValue}
+          {item.pValue}
         </TextInput>
       )}
-      {!item.parameterizable && <Text style={style}>{pValue}</Text>}
+      {!item.parameterizable && <Text style={style}>{item.pValue}</Text>}
     </View>
   )
 }
 
 const ProofRequestAttributesCard: React.FC<ProofRequestAttributesCardParams> = ({ data, onChangeValue }) => {
   const { ListItems, ColorPallet } = useTheme()
-  const { i18n } = useTranslation()
+  const { t, i18n } = useTranslation()
   const { OCABundleResolver } = useConfiguration()
 
   const style = StyleSheet.create({
@@ -111,16 +104,18 @@ const ProofRequestAttributesCard: React.FC<ProofRequestAttributesCardParams> = (
       ...ListItems.requestTemplateTitle,
       fontWeight: 'bold',
       fontSize: 18,
-      paddingVertical: 8,
       marginRight: 8,
     },
     attributesList: {
       paddingLeft: 14,
     },
+    fieldContainer: { flexDirection: 'row', paddingVertical: 8 },
   })
 
   const [meta, setMeta] = useState<MetaOverlay | undefined>(undefined)
   const [attributes, setAttributes] = useState<Field[] | undefined>(undefined)
+  const [attributeTypes, setAttributeTypes] = useState<Record<string, string> | undefined>(undefined)
+  const [attributeFormats, setAttributeFormats] = useState<Record<string, string | undefined> | undefined>(undefined)
 
   useEffect(() => {
     OCABundleResolver.resolve({ identifiers: { schemaId: data.schema }, language: i18n.language }).then(bundle => {
@@ -140,9 +135,6 @@ const ProofRequestAttributesCard: React.FC<ProofRequestAttributesCardParams> = (
         })
       setMeta(metaOverlay)
     })
-  }, [data.schema])
-
-  useEffect(() => {
     const attributes = buildFieldsFromAnonCredsProofRequestTemplate(data)
     OCABundleResolver.presentationFields({
       identifiers: { schemaId: data.schema },
@@ -153,6 +145,32 @@ const ProofRequestAttributesCard: React.FC<ProofRequestAttributesCardParams> = (
     })
   }, [data.schema])
 
+  useEffect(() => {
+    const credDefId = (data.requestedAttributes ?? data.requestedPredicates)
+      ?.flatMap(reqItem => reqItem.restrictions?.map(restrictionItem => restrictionItem.cred_def_id))
+      .find(item => item !== undefined)
+    const params = {
+      identifiers: {
+        credentialDefinitionId: credDefId,
+        schemaId: data.schema,
+      },
+      language: i18n.language,
+      attributes,
+    }
+    OCABundleResolver.resolveAllBundles(params).then(bundle => {
+      setAttributeTypes(bundle?.bundle?.captureBase.attributes)
+      setAttributeFormats(
+        (bundle.bundle as any)?.bundle.attributes
+          .map((attr: any) => {
+            return { name: attr.name, format: attr.format }
+          })
+          .reduce((prev: { [key: string]: string }, curr: { name: string; format?: string }) => {
+            return { ...prev, [curr.name]: curr.format }
+          }, {}),
+      )
+    })
+  }, [])
+
   return (
     <View style={[style.credentialCard]}>
       <Text style={style.schemaTitle}>{meta?.name}</Text>
@@ -161,11 +179,20 @@ const ProofRequestAttributesCard: React.FC<ProofRequestAttributesCardParams> = (
         data={attributes}
         keyExtractor={(record, index) => record.name || index.toString()}
         renderItem={({ item }) => {
+          item.format = attributeFormats?.[item.name ?? '']
+          let parsedPredicate: Predicate | undefined = undefined
+          if (item instanceof Predicate) {
+            parsedPredicate = pTypeToText(item, t, attributeTypes) as Predicate
+            if (!parsedPredicate.parameterizable) {
+              parsedPredicate.pValue = formatIfDate(parsedPredicate.format, parsedPredicate.pValue)
+            }
+          }
+
           return (
-            <View style={{ flexDirection: 'row' }}>
+            <View style={style.fieldContainer}>
               <Text style={style.attributeTitle}>{`\u2022`}</Text>
-              {item instanceof Attribute && <AttributeItem style={style.attributeTitle} item={item as Attribute} />}
-              {item instanceof Predicate && (
+              {!item?.pType && <AttributeItem style={style.attributeTitle} item={item as Attribute} />}
+              {item?.pType && (
                 <PredicateItem
                   item={item as Predicate}
                   style={style.attributeTitle}
@@ -230,11 +257,11 @@ const ProofRequestDetails: React.FC<ProofRequestDetailsProps> = ({ route, naviga
   >(undefined)
 
   const template = useTemplate(templateId)
-  if (!template) {
-    throw new Error('Unable to find proof request template')
-  }
 
   useEffect(() => {
+    if (!template) {
+      return
+    }
     const attributes = template.payload.type === ProofRequestType.AnonCreds ? template.payload.data : []
 
     OCABundleResolver.resolve({ identifiers: { templateId }, language: i18n.language }).then(bundle => {
@@ -255,7 +282,7 @@ const ProofRequestDetails: React.FC<ProofRequestDetailsProps> = ({ route, naviga
       setMeta(metaOverlay)
       setAttributes(attributes)
     })
-  }, [templateId])
+  }, [templateId, template])
 
   const onlyNumberRegex = /^\d+$/
 
@@ -278,6 +305,10 @@ const ProofRequestDetails: React.FC<ProofRequestDetailsProps> = ({ route, naviga
   )
 
   const useProofRequest = useCallback(async () => {
+    if (!template) {
+      return
+    }
+
     if (invalidPredicate) {
       setInvalidPredicate({ visible: true, predicate: invalidPredicate.predicate })
       return
@@ -296,7 +327,7 @@ const ProofRequestDetails: React.FC<ProofRequestDetailsProps> = ({ route, naviga
       // Else redirect to the screen with connectionless request
       navigation.navigate(Screens.ProofRequesting, { templateId, predicateValues: customPredicateValues })
     }
-  }, [templateId, connectionId, customPredicateValues, invalidPredicate])
+  }, [agent, template, templateId, connectionId, customPredicateValues, invalidPredicate])
 
   const showTemplateUsageHistory = useCallback(async () => {
     navigation.navigate(Screens.ProofRequestUsageHistory, { templateId })
diff --git a/app/screens/ProofRequesting.tsx b/app/screens/ProofRequesting.tsx
index a8a109ed..d6b8be27 100644
--- a/app/screens/ProofRequesting.tsx
+++ b/app/screens/ProofRequesting.tsx
@@ -123,10 +123,6 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
     },
   })
 
-  if (!template) {
-    throw new Error('Unable to find proof request template')
-  }
-
   const createProofRequest = useCallback(async () => {
     try {
       setMessage(undefined)
@@ -165,10 +161,15 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
   }, [isFocused])
 
   useEffect(() => {
+    if (!template) {
+      return
+    }
+
     const sendAsyncProof = async () => {
       if (record && record.state === DidExchangeState.Completed) {
         //send haptic feedback to verifier that connection is completed
         Vibration.vibrate()
+        setGenerating(true)
         // send proof logic
         const result = await sendProofRequest(agent, template, record.id, predicateValues)
         if (result?.proofRecord) {
@@ -181,13 +182,15 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
       }
     }
     sendAsyncProof()
-  }, [record])
+  }, [record, template])
 
   useEffect(() => {
     if (proofRecord && (isPresentationReceived(proofRecord) || isPresentationFailed(proofRecord))) {
       if (goalCode?.endsWith('verify.once')) {
         deleteConnectionRecordById(agent, record?.id ?? '')
       }
+
+      setGenerating(true)
       navigation.navigate(Screens.ProofDetails, { recordId: proofRecord.id })
     }
   }, [proofRecord])
@@ -197,7 +200,7 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
       <ScrollView>
         <View style={styles.qrContainer}>
           {generating && <LoadingIndicator />}
-          {message && <QRRenderer value={message} size={qrSize} />}
+          {!generating && message && <QRRenderer value={message} size={qrSize} />}
         </View>
         <View style={styles.headerContainer}>
           <Text style={styles.primaryHeaderText}>{t('Verifier.ScanQR')}</Text>
diff --git a/app/screens/Settings.tsx b/app/screens/Settings.tsx
index 804b2b71..ff0a43c4 100644
--- a/app/screens/Settings.tsx
+++ b/app/screens/Settings.tsx
@@ -277,37 +277,37 @@ const Settings: React.FC<SettingsProps> = ({ navigation }) => {
     }
   }
 
-  if (store.preferences.useVerifierCapability) {
-    settingsSections.splice(1, 0, {
-      header: {
-        icon: 'send',
-        title: t('Screens.ProofRequests'),
+  // if (store.preferences.useVerifierCapability) {
+  settingsSections.splice(1, 0, {
+    header: {
+      icon: 'send',
+      title: t('Screens.ProofRequests'),
+    },
+    data: [
+      {
+        title: t('Screens.SendProofRequest'),
+        accessibilityLabel: t('Screens.ProofRequests'),
+        testID: testIdWithKey('ProofRequests'),
+        onPress: () =>
+          navigation.getParent()?.navigate(Stacks.ProofRequestsStack, {
+            screen: Screens.ProofRequests,
+            params: { navigation: navigation },
+          }),
       },
-      data: [
-        {
-          title: t('Screens.SendProofRequest'),
-          accessibilityLabel: t('Screens.ProofRequests'),
-          testID: testIdWithKey('ProofRequests'),
-          onPress: () =>
-            navigation.getParent()?.navigate(Stacks.ProofRequestsStack, {
-              screen: Screens.ProofRequests,
-              params: { navigation: navigation },
-            }),
-        },
-      ],
-    })
+    ],
+  })
 
-    const section = settingsSections.find(item => item.header.title === t('Settings.AppSettings'))
-    if (section) {
-      section.data.splice(3, 0, {
-        title: t('Settings.DataRetention'),
-        value: store.preferences.useDataRetention ? t('Global.On') : t('Global.Off'),
-        accessibilityLabel: t('Settings.DataRetention'),
-        testID: testIdWithKey('DataRetention'),
-        onPress: () => navigation.navigate(Screens.DataRetention),
-      })
-    }
+  const section = settingsSections.find(item => item.header.title === t('Settings.AppSettings'))
+  if (section) {
+    section.data.splice(3, 0, {
+      title: t('Settings.DataRetention'),
+      value: store.preferences.useDataRetention ? t('Global.On') : t('Global.Off'),
+      accessibilityLabel: t('Settings.DataRetention'),
+      testID: testIdWithKey('DataRetention'),
+      onPress: () => navigation.navigate(Screens.DataRetention),
+    })
   }
+  // }
 
   if (store.preferences.useConnectionInviterCapability) {
     settingsSections.splice(2, 0, {
diff --git a/app/utils/proofBundle.ts b/app/utils/proofBundle.ts
new file mode 100644
index 00000000..97be683e
--- /dev/null
+++ b/app/utils/proofBundle.ts
@@ -0,0 +1,136 @@
+import axios from 'axios'
+
+import { AnonCredsProofRequestTemplatePayload, ProofRequestTemplate, useProofRequestTemplates } from '../../verifier'
+import { useConfiguration } from '../contexts/configuration'
+
+const calculatePreviousYear = (yearOffset: number) => {
+  const pastDate = new Date()
+  pastDate.setFullYear(pastDate.getFullYear() + yearOffset)
+  return parseInt(pastDate.toISOString().split('T')[0].replace(/-/g, ''))
+}
+
+export const applyTemplateMarkers = (templates: any): any => {
+  if (!templates) return templates
+  const markerActions: { [key: string]: (param: string) => string } = {
+    now: () => Math.floor(new Date().getTime() / 1000).toString(),
+    currentDate: (offset: string) => calculatePreviousYear(parseInt(offset)).toString(),
+  }
+  let templateString = JSON.stringify(templates)
+  // regex to find all markers in the template so we can replace them with computed values
+  const markers = [...templateString.matchAll(/"@\{(\w+)(?:\((\S*)\))?\}"/gm)]
+
+  markers.forEach(marker => {
+    const markerValue = markerActions[marker[1] as string](marker[2])
+    templateString = templateString.replace(marker[0], markerValue)
+  })
+  return JSON.parse(templateString)
+}
+
+export const applyDevRestrictions = (templates: ProofRequestTemplate[]): ProofRequestTemplate[] => {
+  return templates.map(temp => {
+    return {
+      ...temp,
+      payload: {
+        ...temp.payload,
+        data: (temp.payload as AnonCredsProofRequestTemplatePayload).data.map(data => {
+          return {
+            ...data,
+            requestedAttributes: data.requestedAttributes?.map(attr => {
+              return {
+                ...attr,
+                restrictions: [...(attr.restrictions ?? []), ...(attr.devRestrictions ?? [])],
+                devRestrictions: [],
+              }
+            }),
+            requestedPredicates: data.requestedPredicates?.map(pred => {
+              return {
+                ...pred,
+                restrictions: [...(pred.restrictions ?? []), ...(pred.devRestrictions ?? [])],
+                devRestrictions: [],
+              }
+            }),
+          }
+        }),
+      },
+    }
+  })
+}
+
+export interface ProofBundleResolverType {
+  resolve: (acceptDevRestrictions: boolean) => Promise<ProofRequestTemplate[] | undefined>
+  resolveById: (templateId: string, acceptDevRestrictions: boolean) => Promise<ProofRequestTemplate | undefined>
+}
+
+export const useRemoteProofBundleResolver = (indexFileBaseUrl: string | undefined): ProofBundleResolverType => {
+  if (indexFileBaseUrl) {
+    return new RemoteProofBundleResolver(indexFileBaseUrl)
+  } else {
+    return new DefaultProofBundleResolver()
+  }
+}
+
+export class RemoteProofBundleResolver implements ProofBundleResolverType {
+  private remoteServer
+  private templateData: ProofRequestTemplate[] | undefined
+
+  public constructor(indexFileBaseUrl: string) {
+    this.remoteServer = axios.create({
+      baseURL: indexFileBaseUrl,
+    })
+  }
+  public async resolve(acceptDevRestrictions: boolean): Promise<ProofRequestTemplate[] | undefined> {
+    if (this.templateData) {
+      let templateData = this.templateData
+      if (acceptDevRestrictions) {
+        templateData = applyDevRestrictions(templateData)
+      }
+      return Promise.resolve(templateData)
+    }
+    return this.remoteServer.get('anoncreds-verification-templates.json').then(response => {
+      try {
+        let templateData: ProofRequestTemplate[] = response.data
+        this.templateData = templateData
+        if (acceptDevRestrictions) {
+          templateData = applyDevRestrictions(templateData)
+        }
+        return templateData
+      } catch (error) {
+        return undefined
+      }
+    })
+  }
+  public async resolveById(
+    templateId: string,
+    acceptDevRestrictions: boolean,
+  ): Promise<ProofRequestTemplate | undefined> {
+    if (!this.templateData) {
+      return (await this.resolve(acceptDevRestrictions))?.find(template => template.id === templateId)
+    } else {
+      let templateData = this.templateData
+      if (acceptDevRestrictions) {
+        templateData = applyDevRestrictions(templateData)
+      }
+      const template = templateData.find(template => template.id === templateId)
+      return template
+    }
+  }
+}
+
+export class DefaultProofBundleResolver implements ProofBundleResolverType {
+  private proofRequestTemplates
+  public constructor() {
+    const { proofRequestTemplates } = useConfiguration()
+    this.proofRequestTemplates = proofRequestTemplates ?? useProofRequestTemplates
+  }
+  public async resolve(acceptDevRestrictions: boolean): Promise<ProofRequestTemplate[]> {
+    return Promise.resolve(this.proofRequestTemplates(acceptDevRestrictions))
+  }
+  public async resolveById(
+    templateId: string,
+    acceptDevRestrictions: boolean,
+  ): Promise<ProofRequestTemplate | undefined> {
+    return Promise.resolve(
+      this.proofRequestTemplates(acceptDevRestrictions).find(template => template.id === templateId),
+    )
+  }
+}
diff --git a/ios/AdeyaWallet.xcodeproj/project.pbxproj b/ios/AdeyaWallet.xcodeproj/project.pbxproj
index 6e4b4a94..31d2f7a9 100644
--- a/ios/AdeyaWallet.xcodeproj/project.pbxproj
+++ b/ios/AdeyaWallet.xcodeproj/project.pbxproj
@@ -507,7 +507,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = AdeyaWallet/AdeyaWallet.entitlements;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = Z5W7KRPGHZ;
 				ENABLE_BITCODE = NO;
@@ -517,7 +517,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -545,7 +545,7 @@
 				CODE_SIGN_ENTITLEMENTS = AdeyaWallet/AdeyaWallet.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = Z5W7KRPGHZ;
 				INFOPLIST_FILE = AdeyaWallet/Info.plist;
@@ -554,7 +554,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/verifier/index.ts b/verifier/index.ts
index 9d33f4c7..cf501b40 100644
--- a/verifier/index.ts
+++ b/verifier/index.ts
@@ -42,4 +42,4 @@ export {
   hasPredicates,
   isParameterizable,
 } from './utils/proof-request'
-export { defaultProofRequestTemplates } from './request-templates'
+export { useProofRequestTemplates } from './request-templates'
diff --git a/verifier/request-templates.ts b/verifier/request-templates.ts
index 509e6555..5bdf0201 100644
--- a/verifier/request-templates.ts
+++ b/verifier/request-templates.ts
@@ -1,80 +1,7 @@
-import { ProofRequestTemplate, ProofRequestType } from './types/proof-reqeust-template'
+import { ProofRequestTemplate } from './types/proof-reqeust-template'
 
-export const defaultProofRequestTemplates: Array<ProofRequestTemplate> = [
-  {
-    id: 'Aries:5:ArbiterFullName:0.0.1:indy',
-    name: 'Student full name',
-    description: 'Verify the full name and date of birth of a arbiter',
-    version: '0.0.1',
-    payload: {
-      type: ProofRequestType.AnonCreds,
-      data: [
-        {
-          schema: 'TfGSZ1rWA4kk8npaaSg7Ca:2:Arbiter:0.1',
-          requestedAttributes: [
-            {
-              name: 'full_name',
-              restrictions: [{ cred_def_id: 'TfGSZ1rWA4kk8npaaSg7Ca:3:CL:53364:Arbiter' }],
-            },
-            {
-              name: 'date_of_birth',
-              restrictions: [{ cred_def_id: 'TfGSZ1rWA4kk8npaaSg7Ca:3:CL:53364:Arbiter' }],
-            },
-          ],
-        },
-      ],
-    },
-  },
-  {
-    id: 'Aries:5:StudentFullName:0.0.1:indy',
-    name: 'Student full name',
-    description: 'Verify the full name of a student',
-    version: '0.0.1',
-    payload: {
-      type: ProofRequestType.AnonCreds,
-      data: [
-        {
-          schema: 'XUxBrVSALWHLeycAUhrNr9:3:CL:26293:Student Card',
-          requestedAttributes: [
-            {
-              name: 'student_first_name',
-              restrictions: [{ cred_def_id: 'XUxBrVSALWHLeycAUhrNr9:3:CL:26293:student_card' }],
-            },
-            {
-              name: 'student_last_name',
-              restrictions: [{ cred_def_id: 'XUxBrVSALWHLeycAUhrNr9:3:CL:26293:student_card' }],
-            },
-          ],
-        },
-      ],
-    },
-  },
-  {
-    id: 'Aries:5:StudentFullNameAndExpirationDate:0.0.1:indy',
-    name: 'Student full name and expiration date',
-    description: 'Verify that full name of a student and that he/she has a not expired student card.',
-    version: '0.0.1',
-    payload: {
-      type: ProofRequestType.AnonCreds,
-      data: [
-        {
-          schema: 'XUxBrVSALWHLeycAUhrNr9:3:CL:26293:Student Card',
-          requestedAttributes: [
-            {
-              names: ['student_first_name', 'student_last_name'],
-              restrictions: [{ cred_def_id: 'XUxBrVSALWHLeycAUhrNr9:3:CL:26293:student_card' }],
-            },
-          ],
-          requestedPredicates: [
-            {
-              name: 'expiry_date',
-              predicateType: '>=',
-              predicateValue: 20240101,
-              restrictions: [{ cred_def_id: 'XUxBrVSALWHLeycAUhrNr9:3:CL:26293:student_card' }],
-            },
-          ],
-        },
-      ],
-    },
-  },
-]
+export const useProofRequestTemplates = () => {
+  const defaultProofRequestTemplates: Array<ProofRequestTemplate> = []
+
+  return defaultProofRequestTemplates
+}