diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 2748517149..c23ff95f22 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -130,6 +130,21 @@
 
             <release-doc-list>
                 <release-improvement-list>
+                    <release-item>
+                        <github-issue id="1770"/>
+                        <github-pull-request id="1980"/>
+
+                        <release-item-contributor-list>
+                            <release-item-ideator id="vojtech.galda"/>
+                            <release-item-ideator id="Pluggi"/>
+                            <release-item-ideator id="asjonos"/>
+                            <release-item-contributor id="david.steele"/>
+                            <release-item-reviewer id="stefan.fercot"/>
+                        </release-item-contributor-list>
+
+                        <p>Add warning about enabling <quote>hierarchical namespace</quote> on Azure storage.</p>
+                    </release-item>
+
                     <release-item>
                         <github-issue id="1910"/>
                         <github-pull-request id="1963"/>
@@ -11916,6 +11931,11 @@
             <contributor-id type="github">argdenis</contributor-id>
         </contributor>
 
+        <contributor id="asjonos">
+            <contributor-name-display>asjonos</contributor-name-display>
+            <contributor-id type="github">asjonos</contributor-id>
+        </contributor>
+
         <contributor id="avinash.vallarapu">
             <contributor-name-display>Avinash Vallarapu</contributor-name-display>
             <contributor-id type="github">avinashvallarapu</contributor-id>
@@ -12591,6 +12611,11 @@
             <contributor-id type="github">PierreDucroquet</contributor-id>
         </contributor>
 
+        <contributor id="Pluggi">
+            <contributor-name-display>Pluggi</contributor-name-display>
+            <contributor-id type="github">Pluggi</contributor-id>
+        </contributor>
+
         <contributor id="pritam.barhate">
             <contributor-name-display>Pritam Barhate</contributor-name-display>
             <contributor-id type="github">pritammobisoft</contributor-id>
@@ -12774,6 +12799,11 @@
             <contributor-id type="github">collectionneurfou</contributor-id>
         </contributor>
 
+        <contributor id="vojtech.galda">
+            <contributor-name-display>Vojtech Galda</contributor-name-display>
+            <contributor-id type="github">vojtechDB</contributor-id>
+        </contributor>
+
         <contributor id="vthriller">
             <contributor-name-display>vthriller</contributor-name-display>
             <contributor-id type="github">vthriller</contributor-id>
diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml
index bdb88c6bf6..4c645066b4 100644
--- a/doc/xml/user-guide.xml
+++ b/doc/xml/user-guide.xml
@@ -687,6 +687,8 @@
     <block-define id="azure-setup">
         <p><backrest/> supports locating repositories in <proper>Azure-compatible</proper> object stores.  The container used to store the repository must be created in advance &amp;mdash; <backrest/> will not do it automatically.  The repository can be located in the container root (<path>/</path>) but it's usually best to place it in a subpath so object store logs or other data can also be stored in the container without conflicts.</p>
 
+        <admonition type="warning">Do not enable <quote>hierarchical namespace</quote> as this will cause errors during expire.</admonition>
+
         <backrest-config host="{[azure-setup-host]}" file="{[backrest-config-demo]}" owner="{[azure-setup-config-owner]}">
             <title>Configure <proper>Azure</proper></title>