diff --git a/Dockerfile b/Dockerfile
index f7927e2fff38f5af18dfb8145f2f7bd4017ecc85..1d24297ed36ea5281519e7b6e6a33b628c37d4df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,10 @@ FROM maven:3-jdk-8
 
 COPY ./src/docker/init/build-in-docker.sh /build-in-docker.sh
 
-VOLUME /portal/
+CMD mkdir /opt/portal/
+
+VOLUME /opt/portal/
+
+WORKDIR /opt/portal/
 
 CMD ["/build-in-docker.sh"]
diff --git a/src/test/docker/application.yml b/config/application.yml
similarity index 100%
rename from src/test/docker/application.yml
rename to config/application.yml
diff --git a/src/docker/build/Dockerfile b/src/docker/build/Dockerfile
deleted file mode 100644
index c2a4425b184734b846fa9cec9a2e9d04fee158a8..0000000000000000000000000000000000000000
--- a/src/docker/build/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# This Dockerfile encapsulate the MIP portal  backend application for development purposes.
-
-FROM maven:3-jdk-8
-
-RUN apt-get update && apt-get install -y wget
-RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize-linux-amd64-v0.2.0.tar.gz
-RUN tar -C /usr/local/bin -xzvf dockerize-linux-amd64-v0.2.0.tar.gz
-
-COPY mip.sh /opt/portal/
-RUN chmod +x /opt/portal/mip.sh
-EXPOSE 8080
-
-VOLUME /opt/portal/config/
-VOLUME /opt/portal/lib/
-
-WORKDIR /opt/portal/
-
-CMD ["/usr/local/bin/dockerize", "-timeout", "240s", "-wait", "tcp://portaldb:5432", "/opt/portal/mip.sh"]
diff --git a/src/docker/build/mip.sh b/src/docker/build/mip.sh
deleted file mode 100644
index cfae68474c42a1e66b80edb0ea849911ddd8eef4..0000000000000000000000000000000000000000
--- a/src/docker/build/mip.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/bin/java -DconfigFile=/opt/portal/config/application.yml -jar /opt/portal/lib/mip.jar
diff --git a/src/docker/init/build-in-docker.sh b/src/docker/init/build-in-docker.sh
old mode 100755
new mode 100644