diff --git a/Dockerfile b/Dockerfile
index 5854f9e..4270e7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,6 +44,7 @@ RUN apk update && \
     nodejs \
     yarn \
     less \
+    bash \
     graphviz \
     shared-mime-info && \
   bundle config jobs $(nproc --all) && \
diff --git a/docker-compose.yml b/docker-compose.yml
index 5febea0..11fe41c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,7 @@ x-rails: &rails
   volumes:
     - .:/progress-test:delegated
     - gems:/home/progress-test:delegated
+    - node_modules:/progress-test/node_modules:delegated
   environment:
     - DISABLE_SPRING=1
     - DATABASE_URL=postgres://postgres:postgres@db:5432
@@ -18,8 +19,7 @@ services:
     command: >
       sh -c '
         bundle check || bundle install &&
-        rm -f tmp/pids/server.pid &&
-        rails s -b 0.0.0.0'
+        bin/rails server -b 0.0.0.0 -p 3000 | yarn build --watch'
     ports:
       - "3000:3000"
 
@@ -42,3 +42,4 @@ services:
 volumes:
   gems:
   pg-data:
+  node_modules:
\ No newline at end of file