diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
index 76bc7b7962c4e58f58146a1976b1000850a8767a..9fc9e12d38ffb3a457f219ee37898dd5092e5f08 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -5,11 +5,4 @@
     <include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
     <include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
     <include relativeToChangelogFile="true" file="create_indizes.xml"/>
-    <include relativeToChangelogFile="true" file="create_districtContact.xml"/>
-    <include relativeToChangelogFile="true" file="insert_KeywordsDistrictOrigin.xml"/>
-    <include relativeToChangelogFile="true" file="alter_districtResponsibleDatatypes.xml"/>
-    <include relativeToChangelogFile="true" file="insert_KeywordsAdviserRoles.xml"/>
-    <include relativeToChangelogFile="true" file="update_ContactResponsible_consistent.xml"/>
-    <include relativeToChangelogFile="true" file="alter_district_1066187.xml"/>
-    <include relativeToChangelogFile="true" file="alter_districtContact_1066036.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index af1c4df61ea5a8c61ac6722772f405b8752fc886..620de869917cdd857fbdaee72b06b6b9ae84c26c 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -6,7 +6,7 @@
     <include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
     <include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Lead/changelog.xml"/>
-    <!--<include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>-->
+    <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
     <include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
     <include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
     <include relativeToChangelogFile="true" file="ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml"/>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_district_1066187.xml b/.liquibase/Data_alias/basic/2021.0.0/District/alter_district.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.2.0/Districts/alter_district_1066187.xml
rename to .liquibase/Data_alias/basic/2021.0.0/District/alter_district.xml
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtContact_1066036.xml b/.liquibase/Data_alias/basic/2021.0.0/District/alter_districtContact.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtContact_1066036.xml
rename to .liquibase/Data_alias/basic/2021.0.0/District/alter_districtContact.xml
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtResponsibleDatatypes.xml b/.liquibase/Data_alias/basic/2021.0.0/District/alter_districtResponsibleDatatypes.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtResponsibleDatatypes.xml
rename to .liquibase/Data_alias/basic/2021.0.0/District/alter_districtResponsibleDatatypes.xml
diff --git a/.liquibase/Data_alias/basic/2021.0.0/District/changelog.xml b/.liquibase/Data_alias/basic/2021.0.0/District/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3532ff12e9f9f98c7a12e6e7ed86787fea18fd48
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.0/District/changelog.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    
+    <include relativeToChangelogFile="true" file="create_districtContact.xml"/>
+    <include relativeToChangelogFile="true" file="insert_KeywordsDistrictOrigin.xml"/>
+    <include relativeToChangelogFile="true" file="alter_districtResponsibleDatatypes.xml"/>
+    <include relativeToChangelogFile="true" file="insert_KeywordsAdviserRoles.xml"/>
+    <include relativeToChangelogFile="true" file="update_ContactResponsible_consistent.xml"/>
+    <include relativeToChangelogFile="true" file="alter_district.xml"/>
+    <include relativeToChangelogFile="true" file="alter_districtContact.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtContact.xml b/.liquibase/Data_alias/basic/2021.0.0/District/create_districtContact.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.2.0/Districts/create_districtContact.xml
rename to .liquibase/Data_alias/basic/2021.0.0/District/create_districtContact.xml
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/insert_KeywordsAdviserRoles.xml b/.liquibase/Data_alias/basic/2021.0.0/District/insert_KeywordsAdviserRoles.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.2.0/Districts/insert_KeywordsAdviserRoles.xml
rename to .liquibase/Data_alias/basic/2021.0.0/District/insert_KeywordsAdviserRoles.xml
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/insert_KeywordsDistrictOrigin.xml b/.liquibase/Data_alias/basic/2021.0.0/District/insert_KeywordsDistrictOrigin.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.2.0/Districts/insert_KeywordsDistrictOrigin.xml
rename to .liquibase/Data_alias/basic/2021.0.0/District/insert_KeywordsDistrictOrigin.xml
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/update_ContactResponsible_consistent.xml b/.liquibase/Data_alias/basic/2021.0.0/District/update_ContactResponsible_consistent.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.2.0/Districts/update_ContactResponsible_consistent.xml
rename to .liquibase/Data_alias/basic/2021.0.0/District/update_ContactResponsible_consistent.xml
diff --git a/.liquibase/Data_alias/basic/2021.0.0/changelog.xml b/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
index 03214d04dddb56df6468be7627898c61bed335e3..b9d869883ec7da822d893825e3a84c1708944a02 100644
--- a/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
@@ -6,4 +6,5 @@
     <include relativeToChangelogFile="true" file="Visit/changelog.xml"/>
     <include relativeToChangelogFile="true" file="UpdateAddrFormats.xml"/>
     <include relativeToChangelogFile="true" file="Address/addLatLonIndizes.xml"/>
+    <include relativeToChangelogFile="true" file="District/changelog.xml"/>
 </databaseChangeLog>
\ No newline at end of file