diff --git a/docker/Dockerfile.vlkb b/docker/Dockerfile
similarity index 80%
rename from docker/Dockerfile.vlkb
rename to docker/Dockerfile
index 14545e640f4d2377b103dcfd4a06aa4da57522b5..e970b10e0e224dff55c51d50ea364f4a03ae0026 100644
--- a/docker/Dockerfile.vlkb
+++ b/docker/Dockerfile
@@ -44,12 +44,12 @@ RUN mkdir -p ${INST_DIR}/etc/vlkb-obscore \
 
 # configure during docker build-time
 
-COPY config-vlkb/vlkb-obscore.datasets.conf ${INST_DIR}/etc/vlkb-obscore/datasets.conf
-COPY config-vlkb/vlkbd.datasets.conf ${INST_DIR}/etc/vlkbd/datasets.conf
+COPY config/vlkb-obscore.datasets.conf ${INST_DIR}/etc/vlkb-obscore/datasets.conf
+COPY config/vlkbd.datasets.conf ${INST_DIR}/etc/vlkbd/datasets.conf
 
-# created in entrypoint.sh COPY config-vlkb/servlet.cutout.properties /webapps/vlkb-cutout/WEB-INF/classes/cutout.properties
+# created in entrypoint.sh COPY config/servlet.cutout.properties /webapps/vlkb-cutout/WEB-INF/classes/cutout.properties
 
-COPY config-vlkb/auth.properties config-vlkb/neatoken.properties config-vlkb/iamtoken.properties /webapps/vlkb-cutout/WEB-INF/classes/
+COPY config/auth.properties config/neatoken.properties config/iamtoken.properties /webapps/vlkb-cutout/WEB-INF/classes/
 
 #COPY ssl/keystore.jks /root/
 COPY ssl/server.xml ssl/server-connector-8080.xml ssl/server-connector-8443.xml /etc/tomcat9/
diff --git a/docker/Makefile b/docker/Makefile
index 3e63e1f6686fecf5deba6100109688a546339336..70f5ec6c13976a8abc989e802c9309a428971d6e 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -32,7 +32,7 @@ ast-9.2.9.tar.gz:
 
 .PHONY: build
 build:
-	docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.vlkb .
+	docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile .
 
 # the docker-login below needed a ca-cert(?) which in the middle of the certificate-chain,
 # but was not automatically downloaded and also local cert/ket pair(?) ->
diff --git a/docker/config-vlkb/auth.properties b/docker/config/auth.properties
similarity index 100%
rename from docker/config-vlkb/auth.properties
rename to docker/config/auth.properties
diff --git a/docker/config-vlkb/authpolicy.properties b/docker/config/authpolicy.properties
similarity index 100%
rename from docker/config-vlkb/authpolicy.properties
rename to docker/config/authpolicy.properties
diff --git a/docker/config-vlkb/context-cutout.xml b/docker/config/context-cutout.xml
similarity index 100%
rename from docker/config-vlkb/context-cutout.xml
rename to docker/config/context-cutout.xml
diff --git a/docker/config-vlkb/formatresponsefilter.properties b/docker/config/formatresponsefilter.properties
similarity index 100%
rename from docker/config-vlkb/formatresponsefilter.properties
rename to docker/config/formatresponsefilter.properties
diff --git a/docker/config-vlkb/iamtoken.properties b/docker/config/iamtoken.properties
similarity index 100%
rename from docker/config-vlkb/iamtoken.properties
rename to docker/config/iamtoken.properties
diff --git a/docker/config-vlkb/neatoken.properties b/docker/config/neatoken.properties
similarity index 100%
rename from docker/config-vlkb/neatoken.properties
rename to docker/config/neatoken.properties
diff --git a/docker/config-vlkb/tomcat-users.xml b/docker/config/tomcat-users.xml
similarity index 100%
rename from docker/config-vlkb/tomcat-users.xml
rename to docker/config/tomcat-users.xml
diff --git a/docker/config-vlkb/vlkb-obscore.datasets.conf b/docker/config/vlkb-obscore.datasets.conf
similarity index 100%
rename from docker/config-vlkb/vlkb-obscore.datasets.conf
rename to docker/config/vlkb-obscore.datasets.conf
diff --git a/docker/config-vlkb/vlkbd.datasets.conf b/docker/config/vlkbd.datasets.conf
similarity index 100%
rename from docker/config-vlkb/vlkbd.datasets.conf
rename to docker/config/vlkbd.datasets.conf