diff --git a/docker-compose.yml b/docker-compose.yml
index bdbbd9db199bacd236d0f5bff34de2051b70bea5..661d365e11a8ce522d6e832cc457cf033693db94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,10 +14,11 @@ services:
         './webpack/webpack.development.config.js',
       ]
     ports:
-      - ${CLIENT_PORT:-4000}:8080
+      - ${CLIENT_PORT:-4000}:${CLIENT_PORT:-4000}
     environment:
       - NODE_ENV=development
       - CLIENT_HOST=0.0.0.0
+      - CLIENT_PORT=${CLIENT_PORT:-4000}
       - SERVER_PROTOCOL=http
       - SERVER_HOST=server
       - SERVER_PORT=3000