diff --git a/ai-hub/app/api/routes/agents.py b/ai-hub/app/api/routes/agents.py
index 62b6e2a..24401be 100644
--- a/ai-hub/app/api/routes/agents.py
+++ b/ai-hub/app/api/routes/agents.py
@@ -165,13 +165,28 @@
 
     @router.post("/{id}/webhook", status_code=202)
     def webhook_receiver(id: str, payload: dict, background_tasks: BackgroundTasks, token: str = None, db: Session = Depends(get_db)):
-        # Validate instance
         instance = db.query(AgentInstance).filter(AgentInstance.id == id).first()
         if not instance:
             raise HTTPException(status_code=404, detail="Instance not found")
+
+        # Verify webhook secret if a webhook trigger is defined for this instance
+        webhook_triggers = db.query(AgentTrigger).filter(
+            AgentTrigger.instance_id == id,
+            AgentTrigger.trigger_type == "webhook"
+        ).all()
+        
+        if webhook_triggers:
+            secrets = [t.webhook_secret for t in webhook_triggers if t.webhook_secret]
+            if secrets and token not in secrets:
+                raise HTTPException(status_code=403, detail="Invalid webhook token")
+
+        # Extract prompt from payload if provided (Design Doc Requirement)
+        if "prompt" in payload:
+            prompt = payload["prompt"]
+        else:
+            # Fallback to serialised payload
+            prompt = f"Webhook Event: {json.dumps(payload)}"
             
-        # Pass webhook event directly to the Agent Executor to process
-        prompt = f"Webhook Event: {json.dumps(payload)}"
         background_tasks.add_task(AgentExecutor.run, instance.id, prompt, services.rag_service, services.user_service)
         return {"message": "Accepted"}
 
diff --git a/frontend/src/features/agents/components/AgentDrillDown.js b/frontend/src/features/agents/components/AgentDrillDown.js
index 9ce0d3a..62be952 100644
--- a/frontend/src/features/agents/components/AgentDrillDown.js
+++ b/frontend/src/features/agents/components/AgentDrillDown.js
@@ -283,6 +283,19 @@
         }
     };
 
+    const handleFireWebhook = async (token, triggerPrompt) => {
+        try {
+            await fetchWithAuth(`/agents/${agentId}/webhook?token=${token}`, {
+                method: 'POST',
+                body: { prompt: triggerPrompt || "Manual test from UI" }
+            });
+            setModalConfig({ title: 'Success', message: 'Webhook test trigger sent successfully!', type: 'success' });
+            fetchData();
+        } catch (err) {
+            setModalConfig({ title: 'Webhook Failed', message: err.message, type: 'error' });
+        }
+    };
+
     if (loading && !agent) return (
         <div className="flex h-screen items-center justify-center bg-[#070b14] text-white">
             <div className="animate-spin w-8 h-8 border-4 border-indigo-500 border-t-transparent rounded-full font-mono text-sm ml-4"></div>
@@ -599,7 +612,29 @@
                                                             <span className="font-mono text-gray-500 dark:text-gray-400 text-xs">
                                                                 {t.trigger_type === 'cron' && `Schedule: ${t.cron_expression} (${describeCron(t.cron_expression)})`}
                                                                 {t.trigger_type === 'interval' && `Every ${t.interval_seconds >= 3600 ? Math.round(t.interval_seconds/3600) + 'h' : t.interval_seconds >= 60 ? Math.round(t.interval_seconds/60) + 'min' : t.interval_seconds + 's'} after completion`}
-                                                                {t.trigger_type === 'webhook' && `Secret: ${t.webhook_secret}`}
+                                                                {t.trigger_type === 'webhook' && (
+                                                                <div className="flex flex-col gap-1 mt-1">
+                                                                    <div className="flex items-center gap-2">
+                                                                        <span className="text-gray-400">URL:</span>
+                                                                        <code className="bg-gray-100 dark:bg-gray-800 px-2 py-0.5 rounded text-[11px] text-indigo-500 break-all">
+                                                                            {`${window.location.origin}/api/v1/agents/${agentId}/webhook?token=${t.webhook_secret}`}
+                                                                        </code>
+                                                                        <button 
+                                                                            onClick={() => {
+                                                                                navigator.clipboard.writeText(`${window.location.origin}/api/v1/agents/${agentId}/webhook?token=${t.webhook_secret}`);
+                                                                                // Optional: Toast notification
+                                                                            }}
+                                                                            className="hover:text-indigo-400 transition-colors"
+                                                                            title="Copy to clipboard"
+                                                                        >
+                                                                            <svg className="w-3 h-3" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M8 7v8a2 2 0 002 2h6M8 7V5a2 2 0 012-2h4.586a1 1 0 01.707.293l4.414 4.414a1 1 0 01.293.707V15a2 2 0 01-2 2h-2M8 7H6a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 0 002-2v-2" /></svg>
+                                                                        </button>
+                                                                    </div>
+                                                                    <span className="text-[10px] text-gray-400 italic">
+                                                                        💡 POST JSON to this URL. You can pass a custom prompt using <code>{"{"}"prompt": "..."{"}"}</code> in the body.
+                                                                    </span>
+                                                                </div>
+                                                            )}
                                                                 {t.trigger_type === 'manual' && `On-demand — Ready for requests`}
                                                             </span>
                                                             {t.default_prompt && (
@@ -608,7 +643,14 @@
                                                         </div>
                                                         <div className="flex items-center gap-2">
                                                             <button 
-                                                                onClick={e => { e.preventDefault(); handleFireTrigger(t.default_prompt); }}
+                                                                onClick={e => { 
+                                                                    e.preventDefault(); 
+                                                                    if (t.trigger_type === 'webhook') {
+                                                                        handleFireWebhook(t.webhook_secret, t.default_prompt);
+                                                                    } else {
+                                                                        handleFireTrigger(t.default_prompt); 
+                                                                    }
+                                                                }}
                                                                 className="text-emerald-600 dark:text-emerald-400 hover:text-emerald-700 font-bold text-xs bg-emerald-50 dark:bg-emerald-500/10 hover:bg-emerald-100 dark:hover:bg-emerald-500/20 px-3 py-1.5 rounded transition-colors"
                                                             >
                                                                 Fire