diff --git a/Dockerfile.product b/Dockerfile.product
index 12371bc3a76..90171b6fd4e 100644
--- a/Dockerfile.product
+++ b/Dockerfile.product
@@ -18,18 +18,21 @@ ADD . .
 USER 0
 # required for node-gyp
 RUN yum install -y python3
-# extract the yarn dependencies that must be provided in the dist-git lookaside cache
-RUN tar fx yarn-offline.tar
-
 # bootstrap yarn so we can install and run the other tools.
-RUN container-entrypoint npm install ./yarn-1.9.4.tgz
+RUN container-entrypoint npm install ./artifacts/yarn-v1.22.19.tar.gz
+
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+
+# use dependencies provided by Cachito
+RUN cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/registry-ca.pem . \
+  && cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/frontend/{.npmrc,.yarnrc,yarn.lock} frontend/
 
 # prevent download of chromedriver, geckodriver, sass, cypress binary, and node headers as part of module installs
 ENV CHROMEDRIVER_SKIP_DOWNLOAD=true \
     GECKODRIVER_SKIP_DOWNLOAD=true \
     SKIP_SASS_BINARY_DOWNLOAD_FOR_CI=true \
     CYPRESS_INSTALL_BINARY=0 \
-    NPM_CONFIG_TARBALL=$HOME/node-v14.16.0-headers.tar.gz
+    NPM_CONFIG_TARBALL=$HOME/artifacts/node-v14.16.0-headers.tar.gz
 
 # run the build
 RUN container-entrypoint ./build-frontend.sh
diff --git a/frontend/package.json b/frontend/package.json
index 6a910284dbe..45797fcb026 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,4 +1,6 @@
 {
+  "name": "openshift-console",
+  "version": "0.0.0",
   "description": "OpenShift Web Console",
   "repository": "https://github.com/openshift/console",
   "license": "Apache-2.0",
diff --git a/frontend/packages/console-plugin-sdk/src/codegen/plugin-resolver.ts b/frontend/packages/console-plugin-sdk/src/codegen/plugin-resolver.ts
index 1f7b3b397a7..a7fe702e94f 100644
--- a/frontend/packages/console-plugin-sdk/src/codegen/plugin-resolver.ts
+++ b/frontend/packages/console-plugin-sdk/src/codegen/plugin-resolver.ts
@@ -68,7 +68,8 @@ export const getMonorepoRootDir = () => {
   return findUp.sync(
     (currentDir) => {
       return fs.existsSync(path.join(currentDir, 'package.json'))
-        ? readPkg.sync({ cwd: currentDir, normalize: true }).name === '' && currentDir
+        ? readPkg.sync({ cwd: currentDir, normalize: true }).name === 'openshift-console' &&
+            currentDir
         : undefined;
     },
     { cwd: __dirname, type: 'directory' },