diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index de8cac42223..1934f477f59 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -17,11 +17,11 @@ services:
       TZ: ${TIMEZONE:-Europe/Bratislava}
       DSPACE_UI_SSL: 'false'
       DSPACE_UI_HOST: dspace-angular
-      DSPACE_UI_PORT: 400${INSTANCE}
+      DSPACE_UI_PORT: 4000
       DSPACE_UI_NAMESPACE: /
-      DSPACE_REST_SSL: 'true'
-      DSPACE_REST_HOST: ${DSPACE_REST_HOST:-localhost}
-      DSPACE_REST_PORT: 8${INSTANCE}
+      DSPACE_REST_SSL: ${DSPACE_SSL:-false}
+      DSPACE_REST_HOST: ${DSPACE_HOST:-localhost}
+      DSPACE_REST_PORT: ${DSPACE_REST_PORT}
       DSPACE_REST_NAMESPACE: /server
     image: ${DSPACE_UI_IMAGE:-dataquest/dspace-angular:dspace-7_x}
     volumes:
@@ -31,9 +31,10 @@ services:
       dockerfile: Dockerfile
     networks:
       dspacenet:
+    entrypoint: ${FE_CMD:-/bin/sh -c "pm2 start dspace-ui.json && pm2 logs"}
     ports:
     - published: 400${INSTANCE}
-      target: 400${INSTANCE}
+      target: 4000
       host_ip: 127.0.0.1
     - published: 987${INSTANCE}
       target: 987${INSTANCE}
diff --git a/dspace-ui.json b/dspace-ui.json
index 8f56c362120..85e020ce63e 100644
--- a/dspace-ui.json
+++ b/dspace-ui.json
@@ -6,14 +6,7 @@
            "script": "dist/server/main.js",
            "instances": "7",
            "exec_mode": "cluster",
-           "node_args": "--max_old_space_size=4096",
-           "env": {
-              "NODE_ENV": "production",
-              "DSPACE_REST_SSL": "true",
-              "DSPACE_REST_HOST": "dspace.tul.cz",
-              "DSPACE_REST_PORT": "443",
-              "DSPACE_REST_NAMESPACE": "/server"
-            }
+           "node_args": "--max_old_space_size=4096"
         }
     ]
 }