diff --git a/docker/Dockerfile b/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to Dockerfile
diff --git a/docker/docker-compose.yml b/docker-compose.yml
similarity index 70%
rename from docker/docker-compose.yml
rename to docker-compose.yml
index ffda285..5a0a26e 100644
--- a/docker/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,20 +1,18 @@
 services:
   fuware:
-    container_name: fuware
-    image: fuware:dev
+    container_name: fuware-be
+    image: fuware-be
     build:
-      context: ../
-      target: production
-      dockerfile: ./docker/Dockerfile
+      context: .
+      dockerfile: Dockerfile
     restart: always
     volumes:
       - fuware-data:/app/data/
     ports:
-      - 9091:9000
+      - 16002:9000
     environment:
       ALLOW_SIGNUP: "false"
       LOG_LEVEL: "DEBUG"
-
       # =====================================
       # Email Configuration
       # SMTP_HOST=
@@ -24,7 +22,3 @@ services:
       # SMTP_FROM_EMAIL=
       # SMTP_USER=
       # SMTP_PASSWORD=
-
-volumes:
-  fuware-data:
-    driver: local