diff --git a/plugins/docker/Dockerfile b/plugins/docker/Dockerfile
index 62ed7c132..3bdb62a46 100644
--- a/plugins/docker/Dockerfile
+++ b/plugins/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/openwallet-foundation/acapy-agent:py3.13-1.5.0rc0 AS base
+FROM ghcr.io/openwallet-foundation/acapy-agent:py3.13-1.5.0 AS base
 
 # Install and Configure Poetry
 USER root
@@ -24,7 +24,7 @@ RUN poetry install --only main
 RUN ln -s $(poetry env info -p)/lib/python3.6/site-packages site-packages
 
 
-FROM ghcr.io/openwallet-foundation/acapy-agent:py3.13-1.5.0rc0
+FROM ghcr.io/openwallet-foundation/acapy-agent:py3.13-1.5.0
 COPY --from=base --chown=aries:aries /home/aries/.venv /home/aries/.venv
 ENV PATH="/home/aries/.venv/bin:$PATH"
 
diff --git a/plugins/traction_innkeeper/poetry.lock b/plugins/traction_innkeeper/poetry.lock
index 6e462a2aa..265a2ea20 100644
--- a/plugins/traction_innkeeper/poetry.lock
+++ b/plugins/traction_innkeeper/poetry.lock
@@ -2,14 +2,14 @@
 
 [[package]]
 name = "acapy-agent"
-version = "1.5.0rc0"
+version = "1.5.0"
 description = "(ACA-Py) A Cloud Agent Python is a foundation for building decentralized identity applications and services running in non-mobile environments. "
 optional = false
 python-versions = "<4.0,>=3.13"
 groups = ["main"]
 files = [
-    {file = "acapy_agent-1.5.0rc0-py3-none-any.whl", hash = "sha256:a6b8fcd822f77153876042fb4e771fb118bd9a2208efd5d4fd5c96f6e49583a0"},
-    {file = "acapy_agent-1.5.0rc0.tar.gz", hash = "sha256:d8bffeb6ccae40879b59636478712a69e8ca1e7e6d5e8bd5f6102865442b7765"},
+    {file = "acapy_agent-1.5.0-py3-none-any.whl", hash = "sha256:2ec2c1ead6f826ac04df5daed9c4d447276ff3d76d994bb8cc9f653abbd0016c"},
+    {file = "acapy_agent-1.5.0.tar.gz", hash = "sha256:271caa0679ede758b89652dd1de45803b10c44d67ac2fd14bef208d50f08e0ec"},
 ]
 
 [package.dependencies]
@@ -33,7 +33,7 @@ Markdown = ">=3.7,<3.11"
 markupsafe = ">=3.0.2,<4.0.0"
 marshmallow = ">=3.26.1,<3.27.0"
 nest_asyncio = ">=1.6.0,<1.7.0"
-packaging = ">=24.2,<26.0"
+packaging = ">=24.2,<27.0"
 portalocker = ">=3.1.1,<4.0.0"
 prompt_toolkit = ">=3.0,<3.1"
 psycopg = {version = ">=3.2.1,<4.0.0", extras = ["binary", "pool"]}
@@ -49,7 +49,7 @@ requests = ">=2.32.3,<2.33.0"
 rlp = ">=4.1.0,<5.0.0"
 sd-jwt = ">=0.10.3,<0.11.0"
 unflatten = ">=0.2,<0.3"
-uuid_utils = ">=0.10,<0.13"
+uuid_utils = ">=0.10,<0.15"
 
 [package.extras]
 bbs = ["ursa-bbs-signatures (>=1.0.1,<1.1.0)"]
@@ -3482,4 +3482,4 @@ propcache = ">=0.2.1"
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.13"
-content-hash = "024aac753f331a472168a6728498439ac628acfbd558f57aba9fd64ae1a58551"
+content-hash = "4f2bccfc28e45c8073b69420c673d04ff4edd050587530d0d048a18ff89f4302"
diff --git a/plugins/traction_innkeeper/pyproject.toml b/plugins/traction_innkeeper/pyproject.toml
index 1160c33f7..2b133315f 100644
--- a/plugins/traction_innkeeper/pyproject.toml
+++ b/plugins/traction_innkeeper/pyproject.toml
@@ -14,7 +14,7 @@ packages = [{include = "traction_innkeeper"}]
 
 [tool.poetry.dependencies]
 python = "^3.13"
-acapy-agent = { version = "1.5.0rc0" }
+acapy-agent = { version = "1.5.0" }
 python-dateutil = "^2.9.0"
 bcrypt = "^4.2.1"
 mergedeep = "^1.3.4"
diff --git a/plugins/traction_innkeeper/traction_innkeeper/v1_0/schema_storage/schema_storage_service.py b/plugins/traction_innkeeper/traction_innkeeper/v1_0/schema_storage/schema_storage_service.py
index 7ef28a2cf..b2103149c 100644
--- a/plugins/traction_innkeeper/traction_innkeeper/v1_0/schema_storage/schema_storage_service.py
+++ b/plugins/traction_innkeeper/traction_innkeeper/v1_0/schema_storage/schema_storage_service.py
@@ -19,15 +19,10 @@
     EVENT_LISTENER_PATTERN as INDY_SCHEMA_EVENT_PATTERN,
 )
 
-# Try to import ANONCREDS_SCHEMA_FINISHED_EVENT, but handle the case where it doesn't exist
-# (e.g., if using an older version of acapy that doesn't have this event yet)
-try:
-    from acapy_agent.anoncreds.events import (
-        SCHEMA_FINISHED_EVENT as ANONCREDS_SCHEMA_FINISHED_EVENT,
-    )
-except (ImportError, AttributeError):
-    # If the event doesn't exist, we'll only subscribe to Indy events
-    ANONCREDS_SCHEMA_FINISHED_EVENT = None
+# Import the AnonCreds schema finished event
+from acapy_agent.anoncreds.events import (
+    SCHEMA_FINISHED_EVENT as ANONCREDS_SCHEMA_FINISHED_EVENT,
+)
 
 LOGGER = logging.getLogger(__name__)
 
@@ -274,13 +269,12 @@ async def sync_created(self, profile: Profile):
 def subscribe(bus: EventBus):
     # Subscribe to Indy schema events
     bus.subscribe(INDY_SCHEMA_EVENT_PATTERN, schemas_event_handler)
-    # Subscribe to AnonCreds schema events if available
-    # Explicitly compile as literal pattern to ensure it's a Pattern object, not a string
-    if ANONCREDS_SCHEMA_FINISHED_EVENT:
-        bus.subscribe(
-            re.compile(re.escape(ANONCREDS_SCHEMA_FINISHED_EVENT)),
-            schemas_event_handler,
-        )
+    # Subscribe to AnonCreds schema finished events
+    # Use exact match pattern - escape special chars and anchor to start/end
+    bus.subscribe(
+        re.compile(f"^{re.escape(ANONCREDS_SCHEMA_FINISHED_EVENT)}$"),
+        schemas_event_handler,
+    )
 
 
 def _normalize_schema_event_payload(event: Event) -> dict:
@@ -292,10 +286,7 @@ def _normalize_schema_event_payload(event: Event) -> dict:
     payload = event.payload
 
     # Check event topic to determine if it's AnonCreds or Indy
-    if (
-        ANONCREDS_SCHEMA_FINISHED_EVENT
-        and event.topic == ANONCREDS_SCHEMA_FINISHED_EVENT
-    ):
+    if event.topic == ANONCREDS_SCHEMA_FINISHED_EVENT:
         # AnonCreds event: SchemaFinishedPayload NamedTuple
         if hasattr(payload, "schema_id"):
             return {
diff --git a/services/tenant-ui/frontend/src/components/connections/Connections.vue b/services/tenant-ui/frontend/src/components/connections/Connections.vue
index b43bba544..949bd883a 100644
--- a/services/tenant-ui/frontend/src/components/connections/Connections.vue
+++ b/services/tenant-ui/frontend/src/components/connections/Connections.vue
@@ -42,13 +42,13 @@
         <template #body="{ data }">
           <MessageConnection
             :connection-id="data.connection_id"
-            :connection-name="data.alias"
+            :connection-name="data.alias || data.their_label || ''"
           />
           <Button
             title="Delete Connection"
             icon="pi pi-trash"
             class="p-button-rounded p-button-icon-only p-button-text"
-            :disabled="deleteDisabled(data.alias)"
+            :disabled="deleteDisabled(data.alias || data.their_label || '')"
             @click="deleteConnection($event, data.connection_id)"
           />
           <EditConnection :connection-id="data.connection_id" />
diff --git a/services/tenant-ui/frontend/src/components/issuance/credentials/RevokeCredentialForm.vue b/services/tenant-ui/frontend/src/components/issuance/credentials/RevokeCredentialForm.vue
index 92dd1068b..74a48ca04 100644
--- a/services/tenant-ui/frontend/src/components/issuance/credentials/RevokeCredentialForm.vue
+++ b/services/tenant-ui/frontend/src/components/issuance/credentials/RevokeCredentialForm.vue
@@ -61,10 +61,7 @@
 <script setup lang="ts">
 // Types
 import { FormattedIssuedCredentialRecord } from '@/helpers/tableFormatters';
-import {
-  RevokeRequest,
-  V20CredExRecordDetail,
-} from '@/types/acapyApi/acapyInterface';
+import { RevokeRequest } from '@/types/acapyApi/acapyInterface';
 
 // Vue/State
 import { reactive, ref } from 'vue';
@@ -109,52 +106,22 @@ const handleSubmit = async (isFormValid: boolean) => {
   }
 
   try {
+    // Use cred_ex_id if available (preferred), otherwise use rev_reg_id and cred_rev_id
     const payload: RevokeRequest = {
       comment: formFields.comment,
       connection_id: props.credExchRecord.connection_id,
-      rev_reg_id: props.credExchRecord.rev_reg_id,
-      cred_rev_id: props.credExchRecord.cred_rev_id,
+      ...(props.credExchRecord.credential_exchange_id
+        ? { cred_ex_id: props.credExchRecord.credential_exchange_id }
+        : {
+            rev_reg_id: props.credExchRecord.rev_reg_id,
+            cred_rev_id: props.credExchRecord.cred_rev_id,
+          }),
       publish: true,
       notify: true,
     };
 
-    // Determine if this is an AnonCreds credential by checking if anoncreds/indy fields exist
-    // FormattedIssuedCredentialRecord extends V20CredExRecordDetail which has indy/anoncreds fields
-    // If only anoncreds exists, it's an AnonCreds credential; if only indy exists, it's Indy
-    // If both or neither exist, pass undefined to let the store determine based on wallet type
-    const credRecord = props.credExchRecord as V20CredExRecordDetail;
-    const hasAnoncreds = !!credRecord.anoncreds;
-    const hasIndy = !!credRecord.indy;
-    const isAnonCredsCredential =
-      hasAnoncreds && !hasIndy
-        ? true
-        : hasIndy && !hasAnoncreds
-          ? false
-          : undefined;
-
-    console.log('Credential format detection:', {
-      hasAnoncreds,
-      hasIndy,
-      isAnonCredsCredential,
-    });
-
-    // Warn if credential format can't be detected - revocation might fail silently
-    if (isAnonCredsCredential === undefined) {
-      toast.warning(
-        'Credential format could not be detected. Please verify the revocation succeeded by checking the credential list.'
-      );
-    }
-
-    await issuerStore.revokeCredential(payload, isAnonCredsCredential);
-
-    // If format couldn't be detected, show a warning message instead of success
-    if (isAnonCredsCredential === undefined) {
-      toast.warning(
-        'Revocation request sent. Please verify the credential was actually revoked in the credential list.'
-      );
-      emit('closed');
-      return;
-    }
+    // The store now determines the endpoint based on wallet type
+    await issuerStore.revokeCredential(payload);
 
     emit('success');
     // close up on success
diff --git a/services/tenant-ui/frontend/src/helpers/tableFormatters.ts b/services/tenant-ui/frontend/src/helpers/tableFormatters.ts
index ade94ad65..8be36927f 100644
--- a/services/tenant-ui/frontend/src/helpers/tableFormatters.ts
+++ b/services/tenant-ui/frontend/src/helpers/tableFormatters.ts
@@ -34,6 +34,7 @@ export interface FormattedIssuedCredentialRecord extends V20CredExRecordDetail {
   created: string;
   cred_rev_id?: string;
   rev_reg_id?: string;
+  credential_exchange_id?: string;
   state: V20CredExRecord['state'];
 }
 
@@ -185,12 +186,23 @@ export const formatIssuedCredentials = (
       }
     }
 
+    const connectionId = ce.cred_ex_record?.connection_id ?? '';
+    // findConnectionName is a function that takes connectionId and returns the connection name
+    // It should use alias first, then their_label as fallback
+    const connectionName =
+      connectionId && findConnectionName
+        ? findConnectionName(connectionId) || ''
+        : '';
+
     return {
+      // Preserve the full V20CredExRecordDetail structure for format detection
+      ...ce,
+      // Explicitly set all formatted values to ensure they override any spread properties
       state: ce.cred_ex_record?.state,
       cred_rev_id: credRevId,
       rev_reg_id: revRegId,
-      connection_id: ce.cred_ex_record?.connection_id,
-      connection: findConnectionName(ce.cred_ex_record?.connection_id ?? ''),
+      connection_id: connectionId,
+      connection: connectionName,
       credential_definition_id: credentialDefinitionDisplay,
       credential_exchange_id: ce.cred_ex_record?.cred_ex_id,
       created: formatDateLong(ce.cred_ex_record?.created_at),
diff --git a/services/tenant-ui/frontend/src/store/connectionStore.ts b/services/tenant-ui/frontend/src/store/connectionStore.ts
index acd2eb9e8..69d747094 100644
--- a/services/tenant-ui/frontend/src/store/connectionStore.ts
+++ b/services/tenant-ui/frontend/src/store/connectionStore.ts
@@ -42,11 +42,14 @@ export const useConnectionStore = defineStore('connection', () => {
 
   const findConnectionName = computed(() => (connectionId: string) => {
     if (loading.value) return undefined;
-    // Find the connection alias for an ID
+    // Find the connection alias for an ID, fallback to their_label
     const connection = connections.value?.find((c: any) => {
       return c.connection_id === connectionId;
     });
-    return connection && connection.alias ? connection.alias : '';
+    if (connection) {
+      return connection.alias || connection.their_label || '';
+    }
+    return '';
   });
 
   // actions
diff --git a/services/tenant-ui/frontend/src/store/governanceStore.ts b/services/tenant-ui/frontend/src/store/governanceStore.ts
index 1c9f88161..0d5e6517b 100644
--- a/services/tenant-ui/frontend/src/store/governanceStore.ts
+++ b/services/tenant-ui/frontend/src/store/governanceStore.ts
@@ -589,46 +589,14 @@ export const useGovernanceStore = defineStore('governance', () => {
       .then((res) => {
         result = res.data;
         console.log(result);
+        // Schema finished event will be handled by the backend event handler
+        // which will automatically add it to storage
       })
       .then(async () => {
-        // Extract schema_id from response
-        const schemaId = result?.schema_state?.schema_id;
-
-        if (!schemaId) {
-          console.warn('No schema_id found in response, cannot verify storage');
-          return;
-        }
-
-        // Wait a bit for event handler to complete (if it runs)
-        await new Promise((resolve) => setTimeout(resolve, 1500));
-
-        // Refresh the stored schema list
+        // Wait a moment for the backend event handler to process and store the schema
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        // Refresh the schema list to show the newly created schema
         await listStoredSchemas();
-
-        // Check if schema is in storage after refresh
-        const storedSchema = storedSchemas.value.find(
-          (s: any) => s.schema_id === schemaId
-        );
-
-        if (!storedSchema) {
-          // Schema not in storage, manually add it via storage endpoint
-          console.log(
-            `Schema ${schemaId} not found in storage after event handler, manually adding...`
-          );
-          try {
-            await addSchemaFromLedgerToStorage({ schema_id: schemaId });
-            // Refresh again after manual add
-            await listStoredSchemas();
-          } catch (err) {
-            console.error(
-              `Failed to manually add schema ${schemaId} to storage:`,
-              err
-            );
-            // Don't throw - schema was created successfully, just storage failed
-          }
-        } else {
-          console.log(`Schema ${schemaId} found in storage`);
-        }
       })
       .catch((err) => {
         console.log(err);
diff --git a/services/tenant-ui/frontend/src/store/issuerStore.ts b/services/tenant-ui/frontend/src/store/issuerStore.ts
index ecf8d33e8..40c5f8d67 100644
--- a/services/tenant-ui/frontend/src/store/issuerStore.ts
+++ b/services/tenant-ui/frontend/src/store/issuerStore.ts
@@ -79,152 +79,57 @@ export const useIssuerStore = defineStore('issuer', () => {
     );
   }
 
-  async function revokeCredential(
-    payload: RevokeRequest,
-    isAnonCredsCredential?: boolean
-  ) {
-    console.log('> issuerStore.revokeCredential');
+  async function revokeCredential(payload?: RevokeRequest) {
     error.value = null;
     loading.value = true;
 
     try {
-      // Determine which endpoint to use based on credential format
-      // If format is not specified, fall back to wallet type
-      let useAnonCredsEndpoint = isAnonCredsCredential;
-
-      // If credential format is not explicitly detected (undefined), check wallet type
-      if (useAnonCredsEndpoint === undefined) {
-        // Ensure wallet is loaded and get wallet type
-        let walletType: string | undefined;
-        if (!tenantStore.tenantWallet?.value) {
-          try {
-            const wallet = await tenantStore.getTenantSubWallet();
-            walletType = wallet?.settings?.['wallet.type'];
-            if (!walletType && wallet) {
-              console.warn(
-                'Wallet retrieved but wallet.type setting not found, defaulting to Indy endpoint'
-              );
-            }
-          } catch (err) {
-            console.error(
-              'Failed to retrieve tenant wallet, defaulting to Indy endpoint:',
-              err
-            );
-            walletType = undefined;
-          }
-        } else {
-          walletType =
-            tenantStore.tenantWallet.value?.settings?.['wallet.type'];
+      // Determine which endpoint to use based on wallet type
+      let walletType: string | undefined;
+      if (!tenantStore.tenantWallet?.value) {
+        try {
+          const wallet = await tenantStore.getTenantSubWallet();
+          walletType = wallet?.settings?.['wallet.type'];
+        } catch (_err) {
+          walletType = undefined;
         }
-
-        // For askar-anoncreds wallets, default to AnonCreds endpoint
-        // For other wallets, default to Indy endpoint
-        useAnonCredsEndpoint = walletType === 'askar-anoncreds';
-
-        console.log(
-          'Credential format not detected, using wallet type:',
-          walletType,
-          '-> useAnonCredsEndpoint:',
-          useAnonCredsEndpoint
-        );
       } else {
-        console.log(
-          'Using explicit credential format detection:',
-          isAnonCredsCredential
-        );
+        walletType = tenantStore.tenantWallet.value?.settings?.['wallet.type'];
       }
 
+      // For askar-anoncreds wallets, use AnonCreds endpoint
+      // For other wallets (askar, etc.), use Indy endpoint
+      const useAnonCredsEndpoint = walletType === 'askar-anoncreds';
+
       const revocationEndpoint = useAnonCredsEndpoint
         ? API_PATH.ANONCREDS_REVOCATION_REVOKE
         : API_PATH.REVOCATION_REVOKE;
 
-      console.log(
-        'Using endpoint:',
-        revocationEndpoint,
-        'for AnonCreds credential:',
-        useAnonCredsEndpoint
-      );
-
       let result: RevocationModuleResponse | null = null;
 
       try {
-        await acapyApi
-          .postHttp(revocationEndpoint, payload)
-          .then(async (res) => {
-            // AnonCreds endpoint returns {} (empty object), Indy returns { item: {...} }
-            result = res.data.item || res.data;
-
-            // Refresh credentials to get updated state
-            await listCredentials();
+        const res = await acapyApi.postHttp(revocationEndpoint, payload);
+        // AnonCreds endpoint returns {} (empty object), Indy returns { item: {...} }
+        result = res.data.item || res.data;
 
-            // For AnonCreds endpoint, verify the revocation actually succeeded
-            // The endpoint might return success but not actually revoke (e.g., Indy credential in AnonCreds wallet)
-            if (useAnonCredsEndpoint && isAnonCredsCredential === undefined) {
-              // Best-effort polling: refresh credentials a few times with a short delay
-              const maxAttempts = 3;
-              const delayMs = 200;
-
-              for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-                await listCredentials();
-
-                // If additional verification logic becomes available (e.g., using a cred_ex_id),
-                // it can be added here to break early when revocation is confirmed.
-
-                if (attempt < maxAttempts) {
-                  await new Promise((resolve) => setTimeout(resolve, delayMs));
-                }
-              }
-              // Check if the credential was actually revoked by looking for it in the list
-              // If credential format wasn't detected, the revocation might have failed silently
-              console.log('Verifying revocation succeeded...');
-              // Note: We can't easily verify here without the cred_ex_id, but the refresh will show the state
-            }
-          })
-          .catch((err) => {
-            error.value = err;
-            // If we got a 500 error, the revocation might have still succeeded
-            // (e.g., error in notification or response serialization after revocation)
-            // Refresh the credential list to check the actual state
-            // Note: We don't await this to avoid overwriting the original error
-            if (err?.response?.status === 500) {
-              console.log(
-                'Got 500 error, refreshing credential list to check if revocation succeeded...'
-              );
-              // Fire-and-forget: don't await to preserve the original error
-              listCredentials().catch(() => {
-                // Silently ignore errors from listCredentials to preserve original error
-              });
-            }
-            // Re-throw to ensure the promise chain rejects
-            throw err;
-          });
+        // Refresh the list to get the updated state from the backend
+        await listCredentials();
       } catch (err) {
-        // Catch any errors that escape the promise chain
-        if (error.value == null) {
-          error.value = err;
-        }
-        // Re-throw to be caught by outer catch block
+        error.value = err;
         throw err;
       }
 
-      console.log('< issuerStore.revokeCredential');
-
       if (error.value != null) {
-        // throw error so $onAction.onError listeners can add their own handler
         const errToThrow = error.value;
         throw errToThrow;
       }
-      // return data so $onAction.after listeners can add their own handler
       return result;
     } catch (err) {
-      // Catch any errors that occur outside the promise chain (e.g., in wallet type check)
-      // or when re-throwing error.value from the promise chain
       if (error.value == null) {
         error.value = err as any;
       }
       throw err;
     } finally {
-      // Always reset loading, regardless of success or error
       loading.value = false;
     }
   }