diff --git a/web/layouts/diags/update-diag.html b/web/layouts/diags/update-diag.html
index cb0da04..1c53e9e 100644
--- a/web/layouts/diags/update-diag.html
+++ b/web/layouts/diags/update-diag.html
@@ -8,7 +8,7 @@
     x-data="{
         fields: {
             name: '{{.ViewState.diag.Name}}',
-            namespace: 'parcoursmob_beneficiaries',
+            namespace: '{{.ViewState.diag.Namespace}}',
             json_schema: '{{.ViewState.diag.Json_schema}}',
             ui_schema: '{{.ViewState.diag.Ui_schema}}',
         },
@@ -64,7 +64,7 @@
                 </div>
             </div>
         </div>
-        <input type="hidden" name="namespace" value="parcoursmob_beneficiaries" />
+        <input type="hidden" name="namespace" value="{{.ViewState.diag.Namespace}}" />
         <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
             <div class="md:grid md:grid-cols-3 md:gap-6">
                 <div class="md:col-span-1">