diff --git a/docker/config/application.tmpl b/docker/config/application.tmpl
index f2587889371ac5ddd7f6bbad5b2f5574d303e07e..5bdfa36a182e1f2290131d4a7d8286e856fb9cb8 100644
--- a/docker/config/application.tmpl
+++ b/docker/config/application.tmpl
@@ -77,8 +77,7 @@ services:
   keycloak:
     keycloakUrl: {{ .Env.KEYCLOAK_URL }}
 
-pathologies:
-  pathologiesUrl: "file:/opt/portal/api/pathologies.json"
-
-algorithms:
-  disabledAlgorithmsUrl: "file:/opt/portal/api/disabledAlgorithms.json"
\ No newline at end of file
+# Files are imported when building the docker image
+files:
+  pathologies_json: "file:/opt/portal/api/pathologies.json"
+  disabledAlgorithms_json: "file:/opt/portal/api/disabledAlgorithms.json"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b64596e794adb4c824a7a6a59d932cb6e6ebaddf..ba87e5423edc50291be61d1e525de2012c3ba567 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,8 +268,9 @@
                     <include>**/*.yml</include>    <!--  Only for development -->
                 </includes>
                 <filtering>true</filtering>
-
             </resource>
+
+            <!-- Used for development. Docker/config folder files added as resources -->
             <resource>
                 <directory>config</directory>
                 <includes>
diff --git a/src/main/java/eu/hbp/mip/controllers/AlgorithmsApi.java b/src/main/java/eu/hbp/mip/controllers/AlgorithmsApi.java
index 07ab6ef291b4dcb32123e4c66f26a625e8b99261..e2c3b6e0ebf0e67a249c655a4fff47f5592b22c1 100644
--- a/src/main/java/eu/hbp/mip/controllers/AlgorithmsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/AlgorithmsApi.java
@@ -55,8 +55,8 @@ public class AlgorithmsApi {
     @Value("#{'${services.galaxy.galaxyApiKey}'}")
     private String galaxyApiKey;
 
-    @Value("#{'${services.algorithms.disabledAlgorithmsUrl}'}")
-    private String disabledAlgorithmsUrl;
+    @Value("#{'${files.disabledAlgorithms_json}'}")
+    private String disabledAlgorithmsFilePath;
 
     @ApiOperation(value = "List all algorithms", response = String.class)
     @RequestMapping(method = RequestMethod.GET)
@@ -200,7 +200,7 @@ public class AlgorithmsApi {
      */
     List<String> getDisabledAlgorithms() throws IOException {
 
-        Resource resource = resourceLoader.getResource(disabledAlgorithmsUrl);
+        Resource resource = resourceLoader.getResource(disabledAlgorithmsFilePath);
 
         List<String> response = gson.fromJson(convertInputStreamToString(
                 resource.getInputStream()),
diff --git a/src/main/java/eu/hbp/mip/controllers/PathologiesApi.java b/src/main/java/eu/hbp/mip/controllers/PathologiesApi.java
index a6979e70ccae284adeed66bdf125f83e256987e9..3835156602fc52aba6df076ea655497b020ead39 100644
--- a/src/main/java/eu/hbp/mip/controllers/PathologiesApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/PathologiesApi.java
@@ -1,7 +1,3 @@
-/**
- * Created by mirco on 04.12.15.
- */
-
 package eu.hbp.mip.controllers;
 
 import com.google.gson.Gson;
@@ -44,8 +40,8 @@ public class PathologiesApi {
     @Value("#{'${hbp.authentication.enabled:1}'}")
     private boolean authenticationIsEnabled;
 
-    @Value("#{'${services.pathologies.pathologiesUrl}'}")
-    private String pathologiesUrl;
+    @Value("#{'${files.pathologies_json}'}")
+    private String pathologiesFilePath;
 
     @Autowired
     private CustomResourceLoader resourceLoader;
@@ -57,7 +53,7 @@ public class PathologiesApi {
         Logging.LogUserAction(username, endpoint, "Loading pathologies ...");
 
         // Load pathologies from file
-        Resource resource = resourceLoader.getResource(pathologiesUrl);
+        Resource resource = resourceLoader.getResource(pathologiesFilePath);
         List<PathologyDTO> allPathologies;
         try {
             allPathologies = gson.fromJson(InputStreamConverter.convertInputStreamToString(resource.getInputStream()), new TypeToken<List<PathologyDTO>>() {
diff --git a/src/main/java/eu/hbp/mip/controllers/SecurityApi.java b/src/main/java/eu/hbp/mip/controllers/SecurityApi.java
index e179b3172446ddd9906f36bca3f7efe6b195c165..77b22fae87ffc252239a402e96dedde6a8bb1a6a 100644
--- a/src/main/java/eu/hbp/mip/controllers/SecurityApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/SecurityApi.java
@@ -96,7 +96,7 @@ public class SecurityApi {
     @Value("#{'${services.galaxy.galaxyPassword:password}'}")
     private String galaxyPassword;
 
-    @Value("#{'${services.galaxy.galaxyContext:nativeGalaxy}'}")
+    @Value("#{'${services.galaxy.galaxpathoyContext:nativeGalaxy}'}")
     private String galaxyContext;
 
     /**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a4c205725b44f860118b7f8417fb14ef9f88f555..5fda7331d2b8e330e136f2d2911ea5127020624d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -74,8 +74,7 @@ services:
   keycloak:
    keycloakUrl: "127.0.0.1"
 
-  pathologies:
-    pathologiesUrl: "classPath:/pathologies.json"
-
-  algorithms:
-    disabledAlgorithmsUrl: "classPath:/disableAlgorithms.json"
\ No newline at end of file
+# Files are loaded from the resources
+files:
+  pathologies_json: "classPath:/pathologies.json"
+  disabledAlgorithms_json: "classPath:/disabledAlgorithms.json"
\ No newline at end of file