diff --git a/diagrams/invitation-flow.md b/diagrams/invitation-flow.md
index fabf187f..d261e2fa 100644
--- a/diagrams/invitation-flow.md
+++ b/diagrams/invitation-flow.md
@@ -1,28 +1,89 @@
 ```mermaid
 sequenceDiagram
-    participant Inviter
-    participant InviteSenderServer as Invite Sender Server
-    participant InviteReceiverServer as Invite Receiver Server
-    participant Invitee
 
-    Inviter->>InviteSenderServer: Calls Invite API
-    InviteSenderServer->>InviteSenderServer: Creates an invite record in the database
-    Note right of InviteSenderServer: Dispatch notification (Email) to invitee\n- Token\n- invite sender server FQDN
+    %% Instance A components
+    box "Instance A" #0f2749
+        participant InviteManagerA as InviteManager A
+        participant GatewayA as Gateway A
+        participant HTTPA as HTTP API A (ocm, sm)
+    end
 
-    InviteSenderServer->>Invitee: Send Email with Token and Server FQDN
-    Invitee->>InviteReceiverServer: Submit invite acceptance form\n(Token, invite sender server FQDN)
-    
-    InviteReceiverServer->>InviteSenderServer: Discover the OCM API of the inviter server
-    InviteReceiverServer->>InviteReceiverServer: Adds FQDN of invite sender server as trusted server
+    %% OCM Invitation Flow
+    %% Actors
+    actor UserA as Alice
+    actor UserB as Bob
+
+    %% Instance B components
+    box "Instance B" #0f2749
+        participant HTTPB as HTTP API B (ocm, sm)
+        participant GatewayB as Gateway B
+        participant InviteManagerB as InviteManager B
+    end
+
+    %% Invitation creation
+    UserA ->> HTTPA: POST /generate-invite (ocm, sm)
+    HTTPA ->> GatewayA: /generate-invite
+    GatewayA ->> InviteManagerA: GenerateInviteToken
+    Note right of InviteManagerA: store token in database
+    InviteManagerA -->> GatewayA: return token
+    GatewayA -->> HTTPA: return token
 
-    InviteReceiverServer->>InviteSenderServer: Accept invite API Call\n(InviteAcceptanceRequestDto)
-    Note left of InviteReceiverServer: InviteAcceptanceRequestDto\n+ recipientProvider: string\n+ token: string\n+ userID: string\n+ email: string\n+ name: string
+    alt
+        HTTPA ->> UserB: Send Email with Alice's Server FQDN and Token
+    else
+        HTTPA ->> UserA: Raw or Base64 encoded "token@FQDN"
+        UserA ->> UserB: Aice passes token to Bob
+    end
 
-    InviteSenderServer->>InviteSenderServer: Add invite receiver FQDN as trusted server
-    InviteSenderServer->>InviteSenderServer: Mark the invitation record as accepted
-    InviteSenderServer->>InviteSenderServer: Add invite receiver in the contacts table
-    InviteSenderServer->>InviteReceiverServer: Return InviteAcceptanceResponseDto
+    alt 
+        UserB ->> UserB: Accept token manually in the EFSS UI
+        UserB ->> HTTPB: POST /accept-invite (ocm, sm)
+    else Use WAYF
+         UserB ->> HTTPA: TODO
+    end
+ 
+    %% Invitation acceptance on B
+    UserB ->> HTTPB: POST /accept-invite (ocm, sm)
+    HTTPB ->> GatewayB: ForwardInvite
+    GatewayB ->> InviteManagerB: ForwardInvite
+    InviteManagerB ->> HTTPA: Discover the OCM API of the inviter server
+    HTTPA ->>InviteManagerB: OCM discovery data
+    InviteManagerB ->> InviteManagerB: Adds FQDN of invite sender server as trusted server
+    InviteManagerB ->> HTTPA: POST /invite-accepted (ocm)
+    rect rgb(191, 223, 255)
+        Note right of UserB: InviteAcceptanceRequestDto
+        rect
+            Note right of UserB: recipientProvider: string
+            Note right of UserB: token: string
+            Note right of UserB: userID: string
+            Note right of UserB: email: string
+            Note right of UserB: name: string
+        end
+    end
+
+    %% Process acceptance on A
+    HTTPA ->> GatewayA: AcceptInvite
+    GatewayA ->> InviteManagerA: AcceptInvite
+    Note right of InviteManagerA: get token from database
+    InviteManagerA ->> InviteManagerA: Add Bob's server FQDN as trusted server
+    InviteManagerA ->> InviteManagerA: Mark the invitation record as accepted
+    InviteManagerA ->> InviteManagerA: Add Bob in the contacts table
+    InviteManagerA -->> GatewayA: return Alice user
+    GatewayA -->> HTTPA: return Alice user
     
-    Note right of InviteReceiverServer: InviteAcceptanceResponseDto\n+ UserId: string\n+ Email: string\n+ Name: string
-    InviteReceiverServer->>Invitee: Adds Invite sender as contact
+    %% Propagation to B
+    HTTPA ->> InviteManagerB: return Alice user
+    rect rgb(191, 223, 255)
+        Note right of UserA: InviteAcceptanceResponseDto
+        rect
+            Note right of UserA: userID: string
+            Note right of UserA: email: string
+            Note right of UserA: name: string
+        end
+    end
+    InviteManagerB ->> InviteManagerB: Add Alice in the contacts table
+    InviteManagerB -->> GatewayB: return
+    GatewayB -->> HTTPB: return
+    HTTPB -->> UserB: return
+
 ```