diff --git a/Dockerfile b/Dockerfile
index 446fe58e99740e8cf54845205c29c39427c29406..6601e5ce93c27dd4ca5968ef1df527fccb1ad7e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,9 @@ RUN chown -R node:node /opt
 EXPOSE 9000
 WORKDIR /opt
 USER node
-RUN npm install
-RUN npm run build
-CMD npm run serve
+RUN yarn install
+RUN yarn run build
+CMD yarn run serve
 
 FROM caddy:latest as httpd
 COPY --from=mirador /opt/public /srv
diff --git a/annotations-plugin b/annotations-plugin
index a1e2371bcb8d4fa41e77767d70ea0e6052d586a0..a52f4ec738ceeeff96aab7a369bf1cdc019e85c1 160000
--- a/annotations-plugin
+++ b/annotations-plugin
@@ -1 +1 @@
-Subproject commit a1e2371bcb8d4fa41e77767d70ea0e6052d586a0
+Subproject commit a52f4ec738ceeeff96aab7a369bf1cdc019e85c1
diff --git a/docker-compose.yml b/docker-compose.yml
index 34cfdc9b92364521df0b77e42b25645e358e7bac..3a4fbec5033b25dc954a77170d09215251df5dbb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,7 @@ services:
       context: .
       dockerfile: Dockerfile
       target: httpd
+    restart: $RESTART
     environment:
       - CORS_ALLOWED_HOSTS
       - WEBPACK_MODE=production