diff --git a/SAMO-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/samointerface/config/SwaggerConfig.java b/SAMO-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/samointerface/config/SwaggerConfig.java
deleted file mode 100644
index 8368afa..0000000
--- a/SAMO-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/samointerface/config/SwaggerConfig.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2019 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************
- */
-package org.eclipse.openk.gridfailureinformation.samointerface.config;
-
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.paths.RelativePathProvider;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import javax.servlet.ServletContext;
-
-@Log4j2
-@Configuration
-@EnableSwagger2
-@Profile({"!test","!prod"})
-public class SwaggerConfig {
-
-    @Value("${swagger.baseUrl:}")
-    public String baseUrl;
-    @Value("${swagger.proxyUrl:}")
-    public String proxyUrl;
-
-    @Bean
-    public Docket api(ServletContext servletContext) {
-        return new Docket(DocumentationType.SWAGGER_2).pathProvider(new RelativePathProvider(servletContext) {
-            @Override
-            public String getApplicationBasePath() {
-                return baseUrl + super.getApplicationBasePath();
-            }
-        }).host(proxyUrl);
-    }
-}
diff --git a/SAMO-Interface/src/main/resources/application.yml b/SAMO-Interface/src/main/resources/application.yml
index 6e307cb..824c904 100644
--- a/SAMO-Interface/src/main/resources/application.yml
+++ b/SAMO-Interface/src/main/resources/application.yml
@@ -29,12 +29,15 @@
     org.springframework.web: ERROR
 
 server:
+  port: 9198
   max-http-header-size: 262144
 
+
 sftp:
   enable-polling: true
   host: 169.50.13.154
   #privateKey: classpath:/keys/privateOpenKQServer_key-SAMO-Interface
+  #privateKey: file:C:\keys\privateOpenKQServer_key-SAMO-Interface
   privateKey:
   privateKeyPassphrase:
   user: ${GFI_SAMO_SFTP_USERNAME}
@@ -100,9 +103,6 @@
     session:
       tracking-modes: cookie
 
-swagger:
-  baseUrl: /test-stoerungsauskunft-interface
-
 sftp:
   enable-polling: false
   host: 169.50.13.154
diff --git a/addressImport/src/main/resources/application.yml b/addressImport/src/main/resources/application.yml
index 7abdedd..8a116ed 100644
--- a/addressImport/src/main/resources/application.yml
+++ b/addressImport/src/main/resources/application.yml
@@ -17,6 +17,7 @@
     password: ${GFI_DB_PASSWORD}
 
 server:
+  port: 9164
   max-http-header-size: 262144
   error:
     include-message: never
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/SwaggerConfig.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/SwaggerConfig.java
index 6f23bb0..5c004e9 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/SwaggerConfig.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/SwaggerConfig.java
@@ -16,6 +16,7 @@
 
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -30,6 +31,7 @@
 @Configuration
 @EnableSwagger2
 @Profile({"!test","!prod"})
+@ConditionalOnProperty(prefix = "swagger", name = "enabled", havingValue = "true", matchIfMissing = false)
 public class SwaggerConfig {
 
     @Value("${swagger.baseUrl:}")
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 14bd04a..c80ee04 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -19,18 +19,20 @@
     max-active: 20
   flyway:
     enabled: false
+    
+  # RabbitMQ configuration
   rabbitmq:
     host: entdockergss
     port: 5672
     username: ${GFI_RABBITMQ_USERNAME}
     password: ${GFI_RABBITMQ_PASSWORD}
 
-    # Importkanal
+    # Importchannel
     importExchange: sitImportExchange
     importQueue: sitImportQueue
     importkey: sitImportExchange.failureImportKey
 
-    # Exportkanäle
+    # Exportchannels
     exportExchange: sitExportExchange
     channels:
       - name: Mail
@@ -44,7 +46,7 @@
         exportQueue: sit_own_export_queue
         exportKey: sit_own_export_key
 
-  # UI Setting (Map)
+  # UI setting (Map)
   settings:
     overviewMapInitialZoom: 10
     detailMapInitialZoom: 10
@@ -52,7 +54,8 @@
     overviewMapInitialLongitude: 8.423207
     daysInPastToShowClosedInfos: 365
     dataExternInitialVisibility: hide
-    # Initial emailsubject and content
+    
+    # Mail settings (Default templates)
     emailSubjectPublishInit: "Die Störung (Sparte: $Sparte$) mit Beginn: $Störungsbeginn_gemeldet$ wurde in den Status veröffentlicht geändert."
     emailContentPublishInit: "Veröffentlicht [TEST]\n
 
@@ -149,6 +152,7 @@
     org.hibernate: ERROR
 
 server:
+  port: 9165
   max-http-header-size: 262144
 
 jwt:
@@ -159,6 +163,7 @@
 gridFailureInformation:
   maxListSize: 2000
 
+# Services configuration
 services:
   authNAuth:
     name: authNAuthService
@@ -212,6 +217,9 @@
 export-to-dmz:
   enabled: true
   cron: 0 */1 * ? * *
+  
+swagger:
+  enabled: true
 ---
 
 spring:
@@ -294,6 +302,8 @@
 cors:
   corsEnabled: true
 
+swagger:
+  enabled: true
 
 ---
 
@@ -326,6 +336,9 @@
 export-to-dmz:
   enabled: false
 
+swagger:
+  enabled: true
+
 ---
 
 spring:
@@ -373,6 +386,9 @@
 cors:
   corsEnabled: true
 
+swagger:
+  enabled: true
+
 ---
 
 spring:
@@ -457,4 +473,5 @@
   corsEnabled: true
 
 swagger:
+  enabled: true
   baseUrl: /gridfailureinformation/api
\ No newline at end of file
diff --git a/gfsBackendService/src/main/resources/application_localdev.yml b/gfsBackendService/src/main/resources/application_localdev.yml
index bbdca8e..a4b9ea1 100644
--- a/gfsBackendService/src/main/resources/application_localdev.yml
+++ b/gfsBackendService/src/main/resources/application_localdev.yml
@@ -209,6 +209,9 @@
 export-to-dmz:
   enabled: false
   cron: 0 */1 * ? * *
+  
+swagger:
+  enabled: false
 
 ---
 
diff --git a/stoerungsauskunftInterface/src/main/resources/application.yml b/stoerungsauskunftInterface/src/main/resources/application.yml
index 3bdd438..81acbd2 100644
--- a/stoerungsauskunftInterface/src/main/resources/application.yml
+++ b/stoerungsauskunftInterface/src/main/resources/application.yml
@@ -11,12 +11,6 @@
 #  SPDX-License-Identifier: EPL-2.0
 #  *******************************************************************************
 spring:
-  datasource:
-    url: jdbc:postgresql://entopticadirx:5432/GridFailureInfoDevServer
-    username: ${GFI_DB_USERNAME}
-    password: ${GFI_DB_PASSWORD}
-  flyway:
-    enabled: false
   rabbitmq:
     host: entdockergss
     port: 5672
diff --git a/stoerungsauskunftInterface/src/main/resources/application_localdev.yml b/stoerungsauskunftInterface/src/main/resources/application_localdev.yml
index 2cac6a3..3128479 100644
--- a/stoerungsauskunftInterface/src/main/resources/application_localdev.yml
+++ b/stoerungsauskunftInterface/src/main/resources/application_localdev.yml
@@ -11,8 +11,6 @@
 #  SPDX-License-Identifier: EPL-2.0
 #  *******************************************************************************
 spring:
-  flyway:
-    enabled: false
   rabbitmq:
     host: entdockergss
     port: 5672