diff --git a/Dockerfile b/Dockerfile
index 6601e5ce93c27dd4ca5968ef1df527fccb1ad7e1..1106b69fc0408c28d65c35a9b29ea847b2e3a707 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,11 @@ RUN chown -R node:node /opt
 EXPOSE 9000
 WORKDIR /opt
 USER node
-RUN yarn install
-RUN yarn run build
-CMD yarn run serve
+CMD npm run serve
+
+FROM mirador as builder
+RUN npm install
+RUN npm run build
 
 FROM caddy:latest as httpd
-COPY --from=mirador /opt/public /srv
+COPY --from=builder /opt/public /srv
diff --git a/dev.yml b/dev.yml
index b339f247909202b495fe5aea9593c5e73e8d483c..fd7dfa48ad42a4d69cebfac2aaeeb9bd7f7d6c45 100644
--- a/dev.yml
+++ b/dev.yml
@@ -1,6 +1,6 @@
 version: "3.3"
 services:
-  devserver:
+  httpd:
     build:
       context: .
       target: mirador
@@ -15,10 +15,6 @@ services:
     volumes:
       - ./:/opt
 
-  httpd:
-    ports:
-      - $PORT:80
-
   annotot:
     ports:
       - ${ANNOTOT_PORT}:3000