diff --git a/oada/Dockerfile b/oada/Dockerfile
index 31de9f39..273eea94 100644
--- a/oada/Dockerfile
+++ b/oada/Dockerfile
@@ -8,7 +8,6 @@ WORKDIR /oada
 
 # Need to list out every package.json we need from monorepo for caching stuff...
 COPY --link ./yarn.lock ./.yarnrc.yml /oada/
-COPY --link ./.yarn /oada/.yarn
 # TODO: How to COPY all package.json files with glob?
 COPY ./package.json /oada/package.json
 COPY ./libs/models/package.json /oada/libs/models/package.json
@@ -37,27 +36,27 @@ FROM packages AS yarn
 COPY --link . /oada/
 
 # Run again to be safe?
-RUN yarn workspaces focus --all --production
+RUN corepack yarn workspaces focus --all --production
 
 # Install all deps and run build step
 # Allows for workspaces to have build step (e.g., for TypeScript)
 FROM packages AS dev
 
 # Install _all_ dependencies for build
-RUN yarn install --immutable
+RUN corepack yarn install --immutable
 
 # Copy in actual code
 COPY --link . /oada/
 
 # Run again to be safe?
-RUN yarn install --immutable
+RUN corepack yarn install --immutable
 
-RUN yarn sdks vscode vim
+RUN corepack yarn sdks vscode vim
 
 FROM dev AS build
 
 # Build and then remove yarn stuff
-RUN yarn build --verbose && rm -rfv .yarn .pnp.*
+RUN corepack yarn build --verbose && rm -rfv .yarn .pnp.*
 
 FROM node:${NODE_VER} AS code
 
diff --git a/oada/utils/entrypoint.sh b/oada/utils/entrypoint.sh
index 4e6f4530..9634ec2a 100755
--- a/oada/utils/entrypoint.sh
+++ b/oada/utils/entrypoint.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Use yarn workspace as "entry point"
-CMD="yarn workspace @oada/${OADA_SERVICE} run $*"
+CMD="corepack yarn workspace @oada/${OADA_SERVICE} run $*"
 
 # Wait for startup, then run CMD.
 ([ "${OADA_SERVICE}" = "startup" ] || /wait-for startup:8080 -q -t 0) &&
@@ -15,4 +15,4 @@ CMD="yarn workspace @oada/${OADA_SERVICE} run $*"
   else
     # Interactive or no transport set?
     exec ${CMD}
-  fi
+  fi
\ No newline at end of file