diff --git a/qa.qanary_component-AnnotationofSpotClass-tgm/docker/eu/wdaqua/qanary/annotationofspotclass/Dockerfile b/qa.qanary_component-AnnotationofSpotClass-tgm/docker/eu/wdaqua/qanary/annotationofspotclass/Dockerfile
deleted file mode 100644
index 0a03d6405..000000000
--- a/qa.qanary_component-AnnotationofSpotClass-tgm/docker/eu/wdaqua/qanary/annotationofspotclass/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.qanary_component-AnnotationofSpotClass-tgm-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qa.qanary_component-AnnotationofSpotProperty-tgm/docker/eu/wdaqua/qanary/annotationofspotproperty/Dockerfile b/qa.qanary_component-AnnotationofSpotProperty-tgm/docker/eu/wdaqua/qanary/annotationofspotproperty/Dockerfile
deleted file mode 100644
index 39d9b0763..000000000
--- a/qa.qanary_component-AnnotationofSpotProperty-tgm/docker/eu/wdaqua/qanary/annotationofspotproperty/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.qanary_component-AnnotationofSpotProperty-tgm-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qa.qanary_component-DiambiguationClass-OKBQA/docker/eu/wdaqua/qanary/diambiguationclass/Dockerfile b/qa.qanary_component-DiambiguationClass-OKBQA/docker/eu/wdaqua/qanary/diambiguationclass/Dockerfile
deleted file mode 100644
index 3841c7193..000000000
--- a/qa.qanary_component-DiambiguationClass-OKBQA/docker/eu/wdaqua/qanary/diambiguationclass/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.qanary_component-DiambiguationClass-OKBQA-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qa.qanary_component-DiambiguationProperty-OKBQA/docker/eu/wdaqua/qanary/diambiguationproperty/Dockerfile b/qa.qanary_component-DiambiguationProperty-OKBQA/docker/eu/wdaqua/qanary/diambiguationproperty/Dockerfile
deleted file mode 100644
index a2bab30a9..000000000
--- a/qa.qanary_component-DiambiguationProperty-OKBQA/docker/eu/wdaqua/qanary/diambiguationproperty/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.qanary_component-DiambiguationProperty-OKBQA-1.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qa.qanary_component-QueryBuilder/docker/eu/wdaqua/qanary/querybuilder/Dockerfile b/qa.qanary_component-QueryBuilder/docker/eu/wdaqua/qanary/querybuilder/Dockerfile
deleted file mode 100644
index 91516de77..000000000
--- a/qa.qanary_component-QueryBuilder/docker/eu/wdaqua/qanary/querybuilder/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.qanary_component-QueryBuilder-1.0.2.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-ASR-kaldi/docker/Dockerfile b/qanary_component-ASR-kaldi/docker/Dockerfile
deleted file mode 100644
index c92951af3..000000000
--- a/qanary_component-ASR-kaldi/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.ASR-kaldi-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-CLS-CLSNLIOD/docker/eu/wdaqua/qanary/clsnliod/Dockerfile b/qanary_component-CLS-CLSNLIOD/docker/eu/wdaqua/qanary/clsnliod/Dockerfile
deleted file mode 100644
index 70b16e1cc..000000000
--- a/qanary_component-CLS-CLSNLIOD/docker/eu/wdaqua/qanary/clsnliod/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-CLS-CLSNLIOD-0.1.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NED-AGDISTIS/docker/Dockerfile b/qanary_component-NED-AGDISTIS/docker/Dockerfile
deleted file mode 100644
index 55af4a0c0..000000000
--- a/qanary_component-NED-AGDISTIS/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.NED-AGDISTIS-1.0.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-NED-Ambiverse/docker/eu/wdaqua/qanary/ambiverse/Dockerfile b/qanary_component-NED-Ambiverse/docker/eu/wdaqua/qanary/ambiverse/Dockerfile
deleted file mode 100644
index 1a107f07f..000000000
--- a/qanary_component-NED-Ambiverse/docker/eu/wdaqua/qanary/ambiverse/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NED-Ambiverse-1.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NED-Aylien/docker/eu/wdaqua/qanary/aylien/Dockerfile b/qanary_component-NED-Aylien/docker/eu/wdaqua/qanary/aylien/Dockerfile
deleted file mode 100644
index 36ea5d461..000000000
--- a/qanary_component-NED-Aylien/docker/eu/wdaqua/qanary/aylien/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NED-Aylien-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NED-Babelfy/docker/eu/wdaqua/qanary/mypackage/Dockerfile b/qanary_component-NED-Babelfy/docker/eu/wdaqua/qanary/mypackage/Dockerfile
deleted file mode 100644
index 4965cb166..000000000
--- a/qanary_component-NED-Babelfy/docker/eu/wdaqua/qanary/mypackage/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NED-Babelfy-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NED-DBpedia-Spotlight/docker/Dockerfile b/qanary_component-NED-DBpedia-Spotlight/docker/Dockerfile
deleted file mode 100644
index 44610105c..000000000
--- a/qanary_component-NED-DBpedia-Spotlight/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.NED-DBpedia-Spotlight-2.0.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-NED-Dandelion/docker/eu/wdaqua/qanary/dandelionned/Dockerfile b/qanary_component-NED-Dandelion/docker/eu/wdaqua/qanary/dandelionned/Dockerfile
deleted file mode 100644
index 0ff4a2c09..000000000
--- a/qanary_component-NED-Dandelion/docker/eu/wdaqua/qanary/dandelionned/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NED-Dandelion-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NED-MeaningCloud/docker/eu/wdaqua/qanary/meaningcloudned/Dockerfile b/qanary_component-NED-MeaningCloud/docker/eu/wdaqua/qanary/meaningcloudned/Dockerfile
deleted file mode 100644
index 4d627f899..000000000
--- a/qanary_component-NED-MeaningCloud/docker/eu/wdaqua/qanary/meaningcloudned/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NED-MeaningCloud-0.1.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NED-Ontotext/docker/eu/wdaqua/qanary/ontotext/Dockerfile b/qanary_component-NED-Ontotext/docker/eu/wdaqua/qanary/ontotext/Dockerfile
deleted file mode 100644
index ca237b852..000000000
--- a/qanary_component-NED-Ontotext/docker/eu/wdaqua/qanary/ontotext/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NED-Ontotext-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NED-tagme/docker/eu/wdaqua/qanary/tagme/Dockerfile b/qanary_component-NED-tagme/docker/eu/wdaqua/qanary/tagme/Dockerfile
deleted file mode 100644
index 7e2db5f58..000000000
--- a/qanary_component-NED-tagme/docker/eu/wdaqua/qanary/tagme/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NED-tagme-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-Aylien/docker/eu/wdaqua/qanary/aylien/Dockerfile b/qanary_component-NER-Aylien/docker/eu/wdaqua/qanary/aylien/Dockerfile
deleted file mode 100644
index 9a8711eff..000000000
--- a/qanary_component-NER-Aylien/docker/eu/wdaqua/qanary/aylien/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-Aylien-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-Babelfy/docker/eu/wdaqua/qanary/mypackage/Dockerfile b/qanary_component-NER-Babelfy/docker/eu/wdaqua/qanary/mypackage/Dockerfile
deleted file mode 100644
index 3d72f3faa..000000000
--- a/qanary_component-NER-Babelfy/docker/eu/wdaqua/qanary/mypackage/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-Babelfy-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-ComicCharacterNameSimpleNamedEntityRecognizer/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile b/qanary_component-NER-ComicCharacterNameSimpleNamedEntityRecognizer/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile
deleted file mode 100644
index 5e39cd3b0..000000000
--- a/qanary_component-NER-ComicCharacterNameSimpleNamedEntityRecognizer/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-ComicCharacterNameSimpleNamedEntityRecognizer-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-DBpedia-Spotlight/docker/Dockerfile b/qanary_component-NER-DBpedia-Spotlight/docker/Dockerfile
deleted file mode 100644
index 7ab621681..000000000
--- a/qanary_component-NER-DBpedia-Spotlight/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.NER-DBpedia-Spotlight-1.0.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-NER-Dandelion/docker/eu/wdaqua/qanary/dandelion/Dockerfile b/qanary_component-NER-Dandelion/docker/eu/wdaqua/qanary/dandelion/Dockerfile
deleted file mode 100644
index 385ffb93e..000000000
--- a/qanary_component-NER-Dandelion/docker/eu/wdaqua/qanary/dandelion/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-Dandelion-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-EntityClassifier/docker/eu/wdaqua/qanary/EntityClassifier/Dockerfile b/qanary_component-NER-EntityClassifier/docker/eu/wdaqua/qanary/EntityClassifier/Dockerfile
deleted file mode 100644
index dc8f245e0..000000000
--- a/qanary_component-NER-EntityClassifier/docker/eu/wdaqua/qanary/EntityClassifier/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-EntityClassifier-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-EntityClassifier2/docker/eu/wdaqua/qanary/EntityClassifier2/Dockerfile b/qanary_component-NER-EntityClassifier2/docker/eu/wdaqua/qanary/EntityClassifier2/Dockerfile
deleted file mode 100644
index 7e9e9bb63..000000000
--- a/qanary_component-NER-EntityClassifier2/docker/eu/wdaqua/qanary/EntityClassifier2/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-EntityClassifier2-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-FOX/docker/Dockerfile b/qanary_component-NER-FOX/docker/Dockerfile
deleted file mode 100644
index 0945a0be9..000000000
--- a/qanary_component-NER-FOX/docker/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM openjdk:11
-
-# Add the service itself
-ARG JAR_FILE
-ADD target/${JAR_FILE} /qanary-service.jar
-
-ENTRYPOINT ["java", "-jar", "/qanary-service.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-MeaningCloud/docker/eu/wdaqua/qanary/meaningcloud/Dockerfile b/qanary_component-NER-MeaningCloud/docker/eu/wdaqua/qanary/meaningcloud/Dockerfile
deleted file mode 100644
index 5896b7cb4..000000000
--- a/qanary_component-NER-MeaningCloud/docker/eu/wdaqua/qanary/meaningcloud/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-MeaningCloud-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-Ontotext/docker/eu/wdaqua/qanary/ontotext/Dockerfile b/qanary_component-NER-Ontotext/docker/eu/wdaqua/qanary/ontotext/Dockerfile
deleted file mode 100644
index 0a7869213..000000000
--- a/qanary_component-NER-Ontotext/docker/eu/wdaqua/qanary/ontotext/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-Ontotext-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-TextRazor/docker/eu/wdaqua/qanary/mypackage/Dockerfile b/qanary_component-NER-TextRazor/docker/eu/wdaqua/qanary/mypackage/Dockerfile
deleted file mode 100644
index 9d2c08efd..000000000
--- a/qanary_component-NER-TextRazor/docker/eu/wdaqua/qanary/mypackage/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-TextRazor-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-ambiverse/docker/eu/wdaqua/qanary/ambiverse/Dockerfile b/qanary_component-NER-ambiverse/docker/eu/wdaqua/qanary/ambiverse/Dockerfile
deleted file mode 100644
index 1be97f62a..000000000
--- a/qanary_component-NER-ambiverse/docker/eu/wdaqua/qanary/ambiverse/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-ambiverse-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NER-stanford/docker/Dockerfile b/qanary_component-NER-stanford/docker/Dockerfile
deleted file mode 100644
index f7b83448a..000000000
--- a/qanary_component-NER-stanford/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.NER-Standford-1.0.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-NER-stanford/src/test/java/eu/wdaqua/qanary/stanfordner/StanfordNERComponentTest.java b/qanary_component-NER-stanford/src/test/java/eu/wdaqua/qanary/stanfordner/StanfordNERComponentTest.java
index 4d69ee4f8..dd8213065 100644
--- a/qanary_component-NER-stanford/src/test/java/eu/wdaqua/qanary/stanfordner/StanfordNERComponentTest.java
+++ b/qanary_component-NER-stanford/src/test/java/eu/wdaqua/qanary/stanfordner/StanfordNERComponentTest.java
@@ -7,13 +7,16 @@
 import java.util.HashMap;
 import java.util.Map.Entry;
 
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import eu.wdaqua.qanary.stanfordner.StanfordNERComponent.Selection;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 public class StanfordNERComponentTest {
 
@@ -22,8 +25,8 @@ public class StanfordNERComponentTest {
 	private static final Logger logger = LoggerFactory.getLogger(StanfordNERComponentTest.class);
 
 	@BeforeClass
-	public static void initStanfordNERComponent(@Value("${spring.application.name") final String applicationName) {
-		myStanfordNERComponent = new StanfordNERComponent(applicationName);
+	public static void initStanfordNERComponent() {
+		myStanfordNERComponent = new StanfordNERComponent("stanfordNER");
 	}
 
 	public void extendQuestionsMap(HashMap<String, ArrayList<String>> questions, String myQuestion,
diff --git a/qanary_component-NER-tagme/docker/eu/wdaqua/qanary/tagme/Dockerfile b/qanary_component-NER-tagme/docker/eu/wdaqua/qanary/tagme/Dockerfile
deleted file mode 100644
index 57dacb801..000000000
--- a/qanary_component-NER-tagme/docker/eu/wdaqua/qanary/tagme/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-NER-tagme-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-NERD-Alchemy/docker/Dockerfile b/qanary_component-NERD-Alchemy/docker/Dockerfile
deleted file mode 100644
index b625fa306..000000000
--- a/qanary_component-NERD-Alchemy/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.NERD-Alchemy-1.0.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-NERD-Lucene-Linker/docker/Dockerfile b/qanary_component-NERD-Lucene-Linker/docker/Dockerfile
deleted file mode 100644
index 8921de0b2..000000000
--- a/qanary_component-NERD-Lucene-Linker/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.NERD-Lucene-Linker-0.1.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-QB-ComicCharacterAlterEgoSimpleDBpediaQueryBuilder/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile b/qanary_component-QB-ComicCharacterAlterEgoSimpleDBpediaQueryBuilder/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile
deleted file mode 100644
index af10fcb7d..000000000
--- a/qanary_component-QB-ComicCharacterAlterEgoSimpleDBpediaQueryBuilder/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-QB-ComicCharacterAlterEgoSimpleDBpediaQueryBuilder-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-QB-SimpleRealNameOfSuperHero/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile b/qanary_component-QB-SimpleRealNameOfSuperHero/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile
deleted file mode 100644
index 18fe2966f..000000000
--- a/qanary_component-QB-SimpleRealNameOfSuperHero/docker/eu/wdaqua/qanary/component/querybuilder/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-QB-SimpleRealNameOfSuperHero-0.1.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-QB-SparqlExecuter/docker/eu/wdaqua/qanary/sparqlexecuter/Dockerfile b/qanary_component-QB-SparqlExecuter/docker/eu/wdaqua/qanary/sparqlexecuter/Dockerfile
deleted file mode 100644
index 41c6e55fe..000000000
--- a/qanary_component-QB-SparqlExecuter/docker/eu/wdaqua/qanary/sparqlexecuter/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-QB-SparqlExecuter-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-REL-RELNLIOD/docker/eu/wdaqua/qanary/relnliod/Dockerfile b/qanary_component-REL-RELNLIOD/docker/eu/wdaqua/qanary/relnliod/Dockerfile
deleted file mode 100644
index 265732267..000000000
--- a/qanary_component-REL-RELNLIOD/docker/eu/wdaqua/qanary/relnliod/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-REL-RELNLIOD-1.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-REL-ReMatch/docker/eu/wdaqua/qanary/rematch/Dockerfile b/qanary_component-REL-ReMatch/docker/eu/wdaqua/qanary/rematch/Dockerfile
deleted file mode 100644
index 3e1d16610..000000000
--- a/qanary_component-REL-ReMatch/docker/eu/wdaqua/qanary/rematch/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-REL-ReMatch-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-REL-RelationLinker1/docker/eu/wdaqua/qanary/relationlinker/Dockerfile b/qanary_component-REL-RelationLinker1/docker/eu/wdaqua/qanary/relationlinker/Dockerfile
deleted file mode 100644
index c3496dcec..000000000
--- a/qanary_component-REL-RelationLinker1/docker/eu/wdaqua/qanary/relationlinker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-REL-RelationLinker1-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-REL-RelationLinker2/docker/eu/wdaqua/qanary/relationlinker2/Dockerfile b/qanary_component-REL-RelationLinker2/docker/eu/wdaqua/qanary/relationlinker2/Dockerfile
deleted file mode 100644
index b9ef9b77a..000000000
--- a/qanary_component-REL-RelationLinker2/docker/eu/wdaqua/qanary/relationlinker2/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qanary_component-REL-RelationLinker2-0.0.1.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/qanary_component-smaph-erd/docker/Dockerfile b/qanary_component-smaph-erd/docker/Dockerfile
deleted file mode 100644
index 04ea00bfb..000000000
--- a/qanary_component-smaph-erd/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM java:8
-
-# Install maven
-RUN apt-get update && apt-get -y install maven
-
-# Install smaph dependencies
-RUN git clone https://github.com/diegoceccarelli/hpc-utils
-WORKDIR /hpc-utils
-RUN mvn install -DskipTests
-
-# Install smaph
-WORKDIR /
-RUN git clone https://github.com/WDAqua/smaph-erd.git
-
-# Run smaph
-WORKDIR /smaph-erd
-ADD smaph-config.xml smaph-config.xml
-ENTRYPOINT ["mvn", "-Djetty.port=9090", "jetty:run"]
-
-VOLUME /tmp
-ADD qa.smaph-erd-1.0.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/qanary_component-smaph-erd/docker/smaph-config.xml b/qanary_component-smaph-erd/docker/smaph-config.xml
deleted file mode 100644
index 548b96040..000000000
--- a/qanary_component-smaph-erd/docker/smaph-config.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<smaph>
-    <setting name="cache">
-        <param name="bing-cache" value="" />
-    </setting>
-    <setting name="bing">
-        <param name="key" value="**BING_KEY**" />
-    </setting>
-    <setting name="tagme">
-        <param name="host" value="tagme.di.unipi.it/tag"/>
-        <param name="key" value="TAGME_KEY" />
-    </setting>
-</smaph>
\ No newline at end of file
diff --git a/qanary_monolitic-wrapper/docker/Dockerfile b/qanary_monolitic-wrapper/docker/Dockerfile
deleted file mode 100644
index 1342bf526..000000000
--- a/qanary_monolitic-wrapper/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM java:8
-VOLUME /tmp
-ADD qa.monolitic-wrapper-1.0.0.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENTRYPOINT ["java", "-server", "-Xms256M", "-Xmx512M", "-XX:MaxDirectMemorySize=256M", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]