diff --git a/src/Agent/AutopilotMonitor.Agent/buildcounter.txt b/src/Agent/AutopilotMonitor.Agent/buildcounter.txt
index 5629a958..6aedc8e1 100644
--- a/src/Agent/AutopilotMonitor.Agent/buildcounter.txt
+++ b/src/Agent/AutopilotMonitor.Agent/buildcounter.txt
@@ -1 +1 @@
-570
+571
diff --git a/src/Backend/AutopilotMonitor.Functions/Functions/Admin/TenantOffboardFunction.cs b/src/Backend/AutopilotMonitor.Functions/Functions/Admin/TenantOffboardFunction.cs
index 31ccb132..85a3445e 100644
--- a/src/Backend/AutopilotMonitor.Functions/Functions/Admin/TenantOffboardFunction.cs
+++ b/src/Backend/AutopilotMonitor.Functions/Functions/Admin/TenantOffboardFunction.cs
@@ -23,17 +23,20 @@ public class TenantOffboardFunction
     private readonly ILogger<TenantOffboardFunction> _logger;
     private readonly TenantAdminsService _tenantAdminsService;
     private readonly GlobalAdminService _globalAdminService;
+    private readonly TableStorageService _storageService;
     private readonly TableServiceClient _tableServiceClient;
 
     public TenantOffboardFunction(
         ILogger<TenantOffboardFunction> logger,
         TenantAdminsService tenantAdminsService,
         GlobalAdminService globalAdminService,
+        TableStorageService storageService,
         IConfiguration configuration)
     {
         _logger = logger;
         _tenantAdminsService = tenantAdminsService;
         _globalAdminService = globalAdminService;
+        _storageService = storageService;
         var connectionString = configuration["AzureTableStorageConnectionString"];
         _tableServiceClient = new TableServiceClient(connectionString);
     }
@@ -78,6 +81,19 @@ public class TenantOffboardFunction
 
         _logger.LogWarning($"TENANT OFFBOARD initiated for tenant {tenantId} by {upn}");
 
+        // Audit under Global TenantId so the entry survives tenant data deletion
+        await _storageService.LogAuditEntryAsync(
+            Constants.AuditGlobalTenantId,
+            "DELETE",
+            "Tenant",
+            tenantId,
+            upn!,
+            new Dictionary<string, string>
+            {
+                { "Action", "Offboard" },
+                { "Phase", "Initiated" }
+            });
+
         var result = new OffboardResult { TenantId = tenantId, InitiatedBy = upn!, InitiatedAt = DateTime.UtcNow };
 
         try
@@ -128,6 +144,19 @@ public class TenantOffboardFunction
             _logger.LogWarning($"TENANT OFFBOARD completed for tenant {tenantId} by {upn}. " +
                 $"Total rows deleted: {result.DeletedCounts.Values.Sum()}");
 
+            // Audit completion with deletion summary
+            var details = result.DeletedCounts.ToDictionary(kv => kv.Key, kv => kv.Value.ToString());
+            details["Action"] = "Offboard";
+            details["Phase"] = "Completed";
+            details["TotalRowsDeleted"] = result.DeletedCounts.Values.Sum().ToString();
+            await _storageService.LogAuditEntryAsync(
+                Constants.AuditGlobalTenantId,
+                "DELETE",
+                "Tenant",
+                tenantId,
+                upn!,
+                details);
+
             var okResponse = req.CreateResponse(HttpStatusCode.OK);
             await okResponse.WriteAsJsonAsync(result);
             return okResponse;