diff --git a/.dockerignore b/.dockerignore
index c535fa427b5..c6fe3c070b2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -15,4 +15,11 @@ node_modules
 /local
 /tmp
 *.yml
+!.yarnrc.yml
 *.md
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/versions
+!.yarn/cache
diff --git a/Dockerfile b/Dockerfile
index 14e4b8761ab..b6bbd040d97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,12 @@ FROM node:16-alpine3.14 as js-builder
 WORKDIR /usr/src/app/
 
 COPY package.json yarn.lock ./
+COPY .yarnrc.yml ./
+COPY .yarn .yarn
 COPY packages packages
+COPY plugins-bundled plugins-bundled
 
-RUN apk --no-cache add git
-RUN yarn install --pure-lockfile --no-progress
+RUN yarn install
 
 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
 COPY public public
@@ -19,7 +21,7 @@ RUN yarn build
 
 FROM golang:1.17.0-alpine3.14 as go-builder
 
-RUN apk add --no-cache gcc g++
+RUN apk add --no-cache gcc g++ make
 
 WORKDIR $GOPATH/src/github.com/grafana/grafana
 
@@ -29,10 +31,11 @@ COPY cue.mod cue.mod
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
 COPY pkg pkg
-COPY build.go package.json ./
+COPY .bingo .bingo
+COPY Makefile build.go package.json ./
 
 RUN go mod verify
-RUN go run build.go build
+RUN make build-go
 
 # Final stage
 FROM alpine:3.14.2
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 6552a6222fd..4010950743c 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,12 +1,14 @@
-FROM node:14.15.1-slim AS js-builder
+FROM node:16-alpine3.14 as js-builder
 
 WORKDIR /usr/src/app/
 
 COPY package.json yarn.lock ./
 COPY packages packages
+COPY .yarnrc.yml ./
+COPY .yarn .yarn
+COPY plugins-bundled plugins-bundled
 
-RUN apt-get update && apt-get install -yq git
-RUN yarn install --pure-lockfile
+RUN yarn install
 
 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
 COPY public public
@@ -22,7 +24,8 @@ FROM golang:1.17.0 AS go-builder
 WORKDIR /src/grafana
 
 COPY go.mod go.sum embed.go ./
-COPY build.go package.json ./
+COPY Makefile build.go package.json ./
+COPY .bingo .bingo
 COPY pkg pkg/
 COPY cue cue/
 COPY cue.mod cue.mod/
@@ -30,7 +33,7 @@ COPY packages/grafana-schema packages/grafana-schema/
 COPY public/app/plugins public/app/plugins/
 
 RUN go mod verify
-RUN go run build.go build
+RUN make build-go
 
 FROM ubuntu:20.04