diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e074632ee..ba81082e14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,8 @@ RELEASING:
  -->
 
 ## [Unreleased]
+### Fixed
+- Define behavior for first container start with existing app.config
 
 ## [6.3.4] - 2021-01-19
 ### Changed
@@ -57,7 +59,7 @@ RELEASING:
 ### Fixed
 - Updated documentation for running in Docker ([#798](https://github.com/GIScience/openrouteservice/issues/798))
 - Handle invalid combination of HillIndexStorage without elevation ([#683](https://github.com/GIScience/openrouteservice/issues/683))
-- Enabled turning off elevation data handling for profiles 
+- Enabled turning off elevation data handling for profiles
 - Fixed a bug in fast isochrones preprocessing
 
 ## [6.3.0] - 2020-09-14
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 5ed00ec775..890f3447ea 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -25,6 +25,8 @@ if [ -d "/usr/local/tomcat/webapps/ors" ]; then
 else
 	if [ ! -f /ors-conf/app.config ]; then
 		cp -f $source_appconfig /ors-conf/app.config
+	else
+		cp -f /ors-conf/app.config $source_appconfig
 	fi
 	echo "### Package openrouteservice and deploy to Tomcat ###"
 	mvn -q -f /ors-core/openrouteservice/pom.xml package -DskipTests && \