diff --git a/src/components/modules/credentials/hooks/useCredentialsList.ts b/src/components/modules/credentials/hooks/useCredentialsList.ts
index 4e73262..0523781 100644
--- a/src/components/modules/credentials/hooks/useCredentialsList.ts
+++ b/src/components/modules/credentials/hooks/useCredentialsList.ts
@@ -134,7 +134,7 @@ export function useCredentialsList() {
         const c = source.find((x) => x.id === vcId);
         void c;
         const { txId } = await revokeCredential(vcId);
-        const net = network === 'mainnet' ? 'public' : 'testnet';
+        const net = network === 'mainnet' ? 'mainnet' : 'testnet';
         const url = `https://stellar.expert/explorer/${net}/tx/${txId}`;
         toast.success('Credential revoked', {
           description: txId,
diff --git a/src/components/modules/issue/hooks/useIssueCredential.ts b/src/components/modules/issue/hooks/useIssueCredential.ts
index 7660cd4..c373280 100644
--- a/src/components/modules/issue/hooks/useIssueCredential.ts
+++ b/src/components/modules/issue/hooks/useIssueCredential.ts
@@ -76,7 +76,7 @@ export function useIssueCredential() {
 
   const ownerDid = useMemo(() => {
     return walletAddress
-      ? `did:pkh:stellar:${network === 'mainnet' ? 'public' : 'testnet'}:${walletAddress}`
+      ? `did:pkh:stellar:${network === 'mainnet' ? 'mainnet' : 'testnet'}:${walletAddress}`
       : undefined;
   }, [walletAddress, network]);
 
@@ -126,7 +126,7 @@ export function useIssueCredential() {
       if (!input) return '';
       const trimmed = input.trim();
       if (trimmed.startsWith('did:')) return trimmed;
-      const env = network === 'mainnet' ? 'public' : 'testnet';
+      const env = network === 'mainnet' ? 'mainnet' : 'testnet';
       return `did:pkh:stellar:${env}:${trimmed}`;
     };
 
@@ -261,7 +261,7 @@ export function useIssueCredential() {
       // Impacta Bootcamp template: ensure recipient has a vault via sponsored vault (sponsor = issuer, owner = recipient, did = owner DID).
       const isImpactaTemplate = tpl.id === 'impacta-certificate';
       if (isImpactaTemplate && !issuingToSelf && ownerG) {
-        const recipientDid = `did:pkh:stellar:${network === 'mainnet' ? 'public' : 'testnet'}:${ownerG}`;
+        const recipientDid = `did:pkh:stellar:${network === 'mainnet' ? 'mainnet' : 'testnet'}:${ownerG}`;
         try {
           await createSponsoredVault({ owner: ownerG, didUri: recipientDid });
         } catch (sponsoredErr: unknown) {
@@ -295,7 +295,7 @@ export function useIssueCredential() {
       });
 
       // Prepare issuance: owner = recipient (ownerG), issuer = signer (activeAddress).
-      const issuerDidLocal = `did:pkh:stellar:${network === 'mainnet' ? 'public' : 'testnet'}:${activeAddress}`;
+      const issuerDidLocal = `did:pkh:stellar:${network === 'mainnet' ? 'mainnet' : 'testnet'}:${activeAddress}`;
       const prep = await actaFetchJson<TxPrepareResp>({
         network,
         apiKey: trimmedApiKey,
@@ -324,7 +324,7 @@ export function useIssueCredential() {
 
       setState((s) => ({ ...s, issuing: false, txId: submit.tx_id }));
 
-      const net = network === 'mainnet' ? 'public' : 'testnet';
+      const net = network === 'mainnet' ? 'mainnet' : 'testnet';
       const url = `https://stellar.expert/explorer/${net}/tx/${submit.tx_id}`;
 
       toast.success('Credential issued', {
diff --git a/src/components/modules/vault/hooks/use-vault-authorized-list.ts b/src/components/modules/vault/hooks/use-vault-authorized-list.ts
index c6409ce..367a421 100644
--- a/src/components/modules/vault/hooks/use-vault-authorized-list.ts
+++ b/src/components/modules/vault/hooks/use-vault-authorized-list.ts
@@ -5,7 +5,7 @@ import { useVault } from '@/components/modules/vault/hooks/use-vault';
 
 function extractGFromDid(did?: string): string | null {
   if (!did) return null;
-  const m = did.match(/did:pkh:stellar:(public|testnet):([A-Z0-9]{56})/i);
+  const m = did.match(/did:pkh:stellar:(mainnet|testnet):([A-Z0-9]{56})/i);
   return m ? m[2] : null;
 }
 
diff --git a/src/components/modules/vault/hooks/use-vault.ts b/src/components/modules/vault/hooks/use-vault.ts
index 4259a66..9a794b8 100644
--- a/src/components/modules/vault/hooks/use-vault.ts
+++ b/src/components/modules/vault/hooks/use-vault.ts
@@ -68,7 +68,7 @@ export function useVault() {
 
   const ownerDid = useMemo(() => {
     return walletAddress
-      ? `did:pkh:stellar:${network === 'mainnet' ? 'public' : 'testnet'}:${walletAddress}`
+      ? `did:pkh:stellar:${network === 'mainnet' ? 'mainnet' : 'testnet'}:${walletAddress}`
       : null;
   }, [walletAddress, network]);
 
diff --git a/src/components/modules/vault/ui/VaultDashboard.tsx b/src/components/modules/vault/ui/VaultDashboard.tsx
index 157ac98..d1b27c1 100644
--- a/src/components/modules/vault/ui/VaultDashboard.tsx
+++ b/src/components/modules/vault/ui/VaultDashboard.tsx
@@ -73,7 +73,7 @@ export default function VaultPage() {
     (value: string) => {
       setSponsorOwnerAddress(value);
       if (value) {
-        const networkId = network === 'mainnet' ? 'public' : 'testnet';
+        const networkId = network === 'mainnet' ? 'mainnet' : 'testnet';
         setSponsorOwnerDid(`did:pkh:stellar:${networkId}:${value}`);
       } else {
         setSponsorOwnerDid('');