diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e7b2d841a269c..b09bcca5b265f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -238,7 +238,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             target: x86_64-unknown-linux-gnu
             platforms: linux/amd64,linux/arm64
     timeout-minutes: 30
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index a4fb10a9b93a6..9e915c1e7385f 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -544,7 +544,7 @@ jobs:
     needs: [latest-tag-sha]
     if: (needs['latest-tag-sha'].outputs.sha != github.sha)
     name: Build & Test :dev for ${{ matrix.name }} without pushing
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 60
     services:
       registry:
diff --git a/packages/cubejs-docker/latest-alpine-jdk.Dockerfile b/packages/cubejs-docker/latest-alpine-jdk.Dockerfile
index 6dbd2038d0a24..76029917b83ca 100644
--- a/packages/cubejs-docker/latest-alpine-jdk.Dockerfile
+++ b/packages/cubejs-docker/latest-alpine-jdk.Dockerfile
@@ -17,7 +17,7 @@ ENV PATH "$JAVA_HOME/bin:${PATH}"
 
 # We are copying root yarn.lock file to the context folder during the Publish GH
 # action. So, a process will use the root lock file here.
-RUN yarn install && yarn cache clean
+RUN yarn install --prod && yarn cache clean
 
 FROM node:16.19.1-alpine3.17
 
diff --git a/packages/cubejs-docker/latest-alpine.Dockerfile b/packages/cubejs-docker/latest-alpine.Dockerfile
index 1df0751e87d88..35fb42db4cb08 100644
--- a/packages/cubejs-docker/latest-alpine.Dockerfile
+++ b/packages/cubejs-docker/latest-alpine.Dockerfile
@@ -14,7 +14,7 @@ RUN apk update \
 
 # We are copying root yarn.lock file to the context folder during the Publish GH
 # action. So, a process will use the root lock file here.
-RUN yarn install && yarn cache clean
+RUN yarn install --prod && yarn cache clean
 
 FROM node:16.19.1-alpine3.17
 
diff --git a/packages/cubejs-docker/latest-debian-jdk.Dockerfile b/packages/cubejs-docker/latest-debian-jdk.Dockerfile
index 73d3201991dca..ae04af1058a10 100644
--- a/packages/cubejs-docker/latest-debian-jdk.Dockerfile
+++ b/packages/cubejs-docker/latest-debian-jdk.Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update \
 
 # We are copying root yarn.lock file to the context folder during the Publish GH
 # action. So, a process will use the root lock file here.
-RUN yarn install && yarn cache clean
+RUN yarn install --prod && yarn cache clean
 
 FROM node:16.19.1-bullseye-slim
 
diff --git a/packages/cubejs-docker/latest.Dockerfile b/packages/cubejs-docker/latest.Dockerfile
index 6655c0ddb604a..451f75e716af8 100644
--- a/packages/cubejs-docker/latest.Dockerfile
+++ b/packages/cubejs-docker/latest.Dockerfile
@@ -4,6 +4,8 @@ WORKDIR /cube
 COPY . .
 
 RUN yarn policies set-version v1.22.19
+# Yarn v1 uses aggressive timeouts with summing time spending on fs, https://github.com/yarnpkg/yarn/issues/4890
+RUN yarn config set network-timeout 120000 -g
 
 # Required for node-oracledb to buld on ARM64
 RUN apt-get update \
@@ -12,9 +14,7 @@ RUN apt-get update \
 
 # We are copying root yarn.lock file to the context folder during the Publish GH
 # action. So, a process will use the root lock file here.
-RUN yarn install && yarn cache clean
-# Yarn v1 uses aggressive timeouts with summing time spending on fs, https://github.com/yarnpkg/yarn/issues/4890
-RUN yarn config set network-timeout 120000 -g
+RUN yarn install --prod && yarn cache clean
 
 FROM node:16.19.1-bullseye-slim
 
diff --git a/packages/cubejs-docker/local.Dockerfile b/packages/cubejs-docker/local.Dockerfile
index 4796c24971b82..cec3509320cc5 100644
--- a/packages/cubejs-docker/local.Dockerfile
+++ b/packages/cubejs-docker/local.Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
 
 # We are copying root yarn.lock file to the context folder during the Publish GH
 # action. So, a process will use the root lock file here.
-RUN yarn install && yarn cache clean && yarn link:dev
+RUN yarn install --prod && yarn cache clean && yarn link:dev
 
 # By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more
 ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules