diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4d437b0e430184a5357d6cd25a14c1921c1e45f..9e480264d27b10f5b9f42326d8eede7268acb154 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.18.1] (2025-12-10)
+
+### Hotfix
+
+This hotfix removes the AUTO_SERVER flag from the embedded database, which causes a Firewall popup when the database is 
+started, due to opening local ports for accessing the database while CityDoctor is running.  
+The Firewall request can be safely denied, as CityDoctor uses the database-file for connections to the database.  
+Accepting the request does not open up remote connections to the database, as H2 by default only allows connections from 
+the local machine.
+
 ## [3.18.0] (2025-12-05)
 
 **Semi-breaking change:** This MR introduces breaking changes to the CityDoctorModel and CityObject classes. Usage of the CityDoctorValidation API and CLI remain backwards compatible.
diff --git a/CityDoctorParent/CityDoctorCheckResult/pom.xml b/CityDoctorParent/CityDoctorCheckResult/pom.xml
index e1c3b8502b8b9f2e23bc3050f0a013f2bc30ba8b..ef9fc5384f02e52c2b7ccad18ee0d2c56a155645 100644
--- a/CityDoctorParent/CityDoctorCheckResult/pom.xml
+++ b/CityDoctorParent/CityDoctorCheckResult/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 	</parent>
 	<artifactId>CityDoctorCheckResult</artifactId>
 	<dependencies>
diff --git a/CityDoctorParent/CityDoctorEdge/pom.xml b/CityDoctorParent/CityDoctorEdge/pom.xml
index 25e060796130f9b8f80768174c09db7d78802fb7..ce045dc1f5b02fef3f739a0c9ac7ba6e30ff335a 100644
--- a/CityDoctorParent/CityDoctorEdge/pom.xml
+++ b/CityDoctorParent/CityDoctorEdge/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 	</parent>
 	<artifactId>CityDoctorEdge</artifactId>
 	<dependencies>
diff --git a/CityDoctorParent/CityDoctorModel/pom.xml b/CityDoctorParent/CityDoctorModel/pom.xml
index 815c086adb29f12a2afc91601c2e39781cf7408e..95f8ea385c35fbdc669567b986c9cc440efd9364 100644
--- a/CityDoctorParent/CityDoctorModel/pom.xml
+++ b/CityDoctorParent/CityDoctorModel/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 	</parent>
 	<properties>
 		<versionString>${project.version}-${git.commit.id.abbrev}</versionString>
diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/EmbeddedDatabaseHandler.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/EmbeddedDatabaseHandler.java
index e7820948571278352564ccbcee6e03782c3cdc8a..0f45a8ddd23841d54a4bb38f53b396281618f940 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/EmbeddedDatabaseHandler.java
+++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/EmbeddedDatabaseHandler.java
@@ -40,7 +40,7 @@ public class EmbeddedDatabaseHandler {
     public EmbeddedDatabaseHandler(){
         try {
             String jdbcurl = H2GISDBFactory.createDataSource(DB_NAME,
-                    true, ";AUTO_SERVER=TRUE").getConnection().getMetaData().getURL();
+                    true, ";").getConnection().getMetaData().getURL();
 
             logger.debug("1] {}",jdbcurl);
             HikariDataSource ds = new HikariDataSource();
diff --git a/CityDoctorParent/CityDoctorValidation/pom.xml b/CityDoctorParent/CityDoctorValidation/pom.xml
index 6cd0386295bb343dc7714a176c38058d7581c16f..c9514e87ac6f0487a914b8ed92504ebf64c007b5 100644
--- a/CityDoctorParent/CityDoctorValidation/pom.xml
+++ b/CityDoctorParent/CityDoctorValidation/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 	</parent>
 	<artifactId>CityDoctorValidation</artifactId>
 	<name>CityDoctorValidation</name>
diff --git a/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml b/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml
index ec1f300cee9974e688d6e4f4f7c4f9b11953cd7a..5c148498917e4946c5442cd558c1e9a11651ea21 100644
--- a/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml
+++ b/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorAutoPro</artifactId>
diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/pom.xml b/CityDoctorParent/Extensions/CityDoctorGUI/pom.xml
index 01e74c250d42360399c1b8c6ba2c73ee5ed30856..96ca688805d727146643f86cb4fb4c960384f2f5 100644
--- a/CityDoctorParent/Extensions/CityDoctorGUI/pom.xml
+++ b/CityDoctorParent/Extensions/CityDoctorGUI/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorGUI</artifactId>
diff --git a/CityDoctorParent/Extensions/CityDoctorHealer/pom.xml b/CityDoctorParent/Extensions/CityDoctorHealer/pom.xml
index f31ce66ad603025f32918033b6dc47651b9f1ed1..6076712be924666b5d72e9ccd3b3f17ce61aade3 100644
--- a/CityDoctorParent/Extensions/CityDoctorHealer/pom.xml
+++ b/CityDoctorParent/Extensions/CityDoctorHealer/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorHealer</artifactId>
diff --git a/CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml b/CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml
index 7368ea56d9515f15c9c4287e2b2598aa00767e9b..d811336283aa28f825b52369226ec9b5663b3deb 100644
--- a/CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml
+++ b/CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorHealerGUI</artifactId>
diff --git a/CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml b/CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml
index 280bad626a5cc32576f63953edd9bfc249e18914..c98ae3bc2ae2f31f1eaabd16522e14276cdda809 100644
--- a/CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml
+++ b/CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorHealerGenetic</artifactId>
diff --git a/CityDoctorParent/pom.xml b/CityDoctorParent/pom.xml
index b5198f83b37d839a77d49dd77d9d5806dcd0f2cc..e7728964c2347576abdad0c0780c964139021e25 100644
--- a/CityDoctorParent/pom.xml
+++ b/CityDoctorParent/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.hft.stuttgart</groupId>
     <artifactId>CityDoctorParent</artifactId>
-    <version>3.18.0</version>
+    <version>3.18.1</version>
     <packaging>pom</packaging>
     <name>CityDoctorParent</name>
     <properties>