diff --git a/buildDistribution.sh b/buildDistribution.sh
index faf12f9..3a30129 100755
--- a/buildDistribution.sh
+++ b/buildDistribution.sh
@@ -14,13 +14,6 @@ PUSH_HARBOR=false
 LOGIN_HARBOR=false
 MULTI_PLATFORM=false
 
-
-IMAGE_VERSION=${SMARTGEARS_VERSION}-java${JAVA_VERSION}-tomcat${TOMCAT_VERSION}
-
-BUILD_NAME=$NAME:$IMAGE_VERSION
-
-echo "BUILD_NAME=$BUILD_NAME"
-
 ################################################################################
 # Help                                                                         #
 ################################################################################
@@ -71,6 +64,11 @@ do
    esac
 done
 
+IMAGE_VERSION=${SMARTGEARS_VERSION}-java${JAVA_VERSION}-tomcat${TOMCAT_VERSION}
+
+BUILD_NAME=$NAME:$IMAGE_VERSION
+
+echo "BUILD_NAME=$BUILD_NAME"
 
 if [ ${LOGIN_HARBOR} = true ]; 
    then
diff --git a/pom.xml b/pom.xml
index a58ad23..ab9dd91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,10 @@
 		<wiki>https://wiki.gcube-system.org/gcube/SmartGears</wiki>
 	</properties>
 	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
+		<connection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
 		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
 	<dependencyManagement>
diff --git a/tomcat_files/startContainer.sh b/tomcat_files/startContainer.sh
index da1540f..f3951e8 100644
--- a/tomcat_files/startContainer.sh
+++ b/tomcat_files/startContainer.sh
@@ -12,8 +12,8 @@ if [ -f "$container" ]; then
  cp $container /smartgears-distribution
 fi
 
-if [ -d "$configfolder" ]; then
- echo "config folder exists"
+if [ -d "$configfolder" ] && ! [ -z "$(ls -A $configfolder)" ]; then
+ echo "config folder exists and is not empty"
  cp -R $configfolder/* /smartgears-distribution/config/apps/ 	
 fi