diff --git a/Dockerfile b/Dockerfile
index 6250662..4c44ba0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,9 +33,9 @@ RUN \
     libffi-dev \
     mariadb-dev \
     nodejs \
+    npm \
     postgresql-dev \
-    ruby-dev \
-    yarn && \
+    ruby-dev && \
   echo "**** install manyfold ****" && \
   mkdir -p /app/www && \
   if [ -z ${MANYFOLD_VERSION+x} ]; then \
@@ -51,6 +51,8 @@ RUN \
     /tmp/manyfold.tar.gz -C \
     /app/www/ --strip-components=1 && \
   cd /app/www && \
+  npm install -g corepack && \
+  corepack enable && \
   yarn install && \
   gem install foreman && \
   sed -i 's/\d.\d.\d/3.3.3/' .ruby-version && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 50bb0a2..325246c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -33,9 +33,9 @@ RUN \
     libffi-dev \
     mariadb-dev \
     nodejs \
+    npm \
     postgresql-dev \
-    ruby-dev \
-    yarn && \
+    ruby-dev && \
   echo "**** install manyfold ****" && \
   mkdir -p /app/www && \
   if [ -z ${MANYFOLD_VERSION+x} ]; then \
@@ -51,6 +51,8 @@ RUN \
     /tmp/manyfold.tar.gz -C \
     /app/www/ --strip-components=1 && \
   cd /app/www && \
+  npm install -g corepack && \
+  corepack enable && \
   yarn install && \
   gem install foreman && \
   sed -i 's/\d.\d.\d/3.3.3/' .ruby-version && \