Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs
===================================================================
diff -u -r4de96eb4f05ba26d5b99b025880525649fafe0ab -rd8c26900c20f9e5f7a95987ed8633d9b96ddb42d
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs	(.../AssemblyGmlWriter.cs)	(revision 4de96eb4f05ba26d5b99b025880525649fafe0ab)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs	(.../AssemblyGmlWriter.cs)	(revision d8c26900c20f9e5f7a95987ed8633d9b96ddb42d)
@@ -88,6 +88,8 @@
                 writer.WriteAttributeString(AssemblyXmlIdentifiers.XmlnsIdentifier, AssemblyXmlIdentifiers.XLinkNamespaceIdentifier, null, AssemblyXmlIdentifiers.XLinkNamespace);
                 writer.WriteAttributeString(AssemblyXmlIdentifiers.XmlnsIdentifier, AssemblyXmlIdentifiers.GmlNamespaceIdentifier, null, AssemblyXmlIdentifiers.GmlNamespace);
                 writer.WriteAttributeString(AssemblyXmlIdentifiers.XmlnsIdentifier, AssemblyXmlIdentifiers.ImwapNamespaceIdentifier, null, AssemblyXmlIdentifiers.ImwapNamespace);
+                writer.WriteAttributeString(AssemblyXmlIdentifiers.XmlnsIdentifier, AssemblyXmlIdentifiers.XsiNamespaceIdentifier, null, AssemblyXmlIdentifiers.XsiNamespace);
+                writer.WriteAttributeString(AssemblyXmlIdentifiers.SchemaLocationIdentifier, AssemblyXmlIdentifiers.XsiNamespace, AssemblyXmlIdentifiers.SchemaLocation);
                 writer.WriteAttributeString(AssemblyXmlIdentifiers.Id, AssemblyXmlIdentifiers.GmlNamespace, assembly.Id);
 
                 ExportableAssessmentSection assessmentSection = assembly.AssessmentSection;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/configuredAssembly.gml
===================================================================
diff -u -rbb768ac81cf6072b159d72772379fed5a60f4958 -rd8c26900c20f9e5f7a95987ed8633d9b96ddb42d
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/configuredAssembly.gml	(.../configuredAssembly.gml)	(revision bb768ac81cf6072b159d72772379fed5a60f4958)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/configuredAssembly.gml	(.../configuredAssembly.gml)	(revision d8c26900c20f9e5f7a95987ed8633d9b96ddb42d)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<uboi:Assembleren-collectie xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:imwap="http://data.aquo.nl/xsd/BOI/imwaproxies/v20220630" gml:id="assemblage1" xmlns:uboi="http://data.aquo.nl/xsd/BOI/uitwisselmodel/v20220630">
+<uboi:Assembleren-collectie xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:imwap="http://data.aquo.nl/xsd/BOI/imwaproxies/v20220630" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://data.aquo.nl/xsd/BOI/uitwisselmodel/v20220630 http://data.aquo.nl/xsd/BOI/uitwisselmodel/v20220630/BOI_Uitwisselmodel_v1_0.xsd" gml:id="assemblage1" xmlns:uboi="http://data.aquo.nl/xsd/BOI/uitwisselmodel/v20220630">
   <uboi:featureMember>
     <imwap:Waterkeringstelsel gml:id="section1">
       <imwap:geometrie2D>
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml
===================================================================
diff -u -rbb768ac81cf6072b159d72772379fed5a60f4958 -rd8c26900c20f9e5f7a95987ed8633d9b96ddb42d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml	(.../ExpectedGml.gml)	(revision bb768ac81cf6072b159d72772379fed5a60f4958)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml	(.../ExpectedGml.gml)	(revision d8c26900c20f9e5f7a95987ed8633d9b96ddb42d)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<uboi:Assembleren-collectie xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:imwap="http://data.aquo.nl/xsd/BOI/imwaproxies/v20220630" gml:id="assemblage.0" xmlns:uboi="http://data.aquo.nl/xsd/BOI/uitwisselmodel/v20220630">
+<uboi:Assembleren-collectie xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:imwap="http://data.aquo.nl/xsd/BOI/imwaproxies/v20220630" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://data.aquo.nl/xsd/BOI/uitwisselmodel/v20220630 http://data.aquo.nl/xsd/BOI/uitwisselmodel/v20220630/BOI_Uitwisselmodel_v1_0.xsd" gml:id="assemblage.0" xmlns:uboi="http://data.aquo.nl/xsd/BOI/uitwisselmodel/v20220630">
   <uboi:featureMember>
     <imwap:Waterkeringstelsel gml:id="Wks.assessmentSectionId">
       <imwap:geometrie2D>