diff --git a/Dockerfile b/Dockerfile
index 98e366a9d16..5e950312ae6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /usr/src/app/
 
 COPY package.json yarn.lock ./
 COPY packages packages
+COPY plugins-bundled plugins-bundled
 
 RUN apk --no-cache add git
 RUN yarn install --pure-lockfile --no-progress
@@ -19,7 +20,7 @@ RUN yarn build
 
 FROM golang:1.17.3-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 +30,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 Makefile build.go package.json ./
+COPY .bingo .bingo
 
 RUN go mod verify
-RUN go run build.go build
+RUN make build-go
 
 # Final stage
 FROM alpine:3.14.3
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index a956f3f7a1a..077f6aeff73 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -4,6 +4,7 @@ WORKDIR /usr/src/app/
 
 COPY package.json yarn.lock ./
 COPY packages packages
+COPY plugins-bundled plugins-bundled
 
 RUN apt-get update && apt-get install -yq git
 RUN yarn install --pure-lockfile
@@ -19,10 +20,13 @@ RUN yarn build
 
 FROM golang:1.17.3 AS go-builder
 
+RUN apk add --no-cache make
+
 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 +34,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