diff --git a/Dockerfile b/Dockerfile
index b1759f9f470..9e2de422928 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,8 +11,7 @@ COPY vendor vendor
 RUN go mod verify
 
 COPY pkg pkg
-COPY build.go build.go
-COPY package.json package.json
+COPY build.go package.json ./
 
 RUN go run build.go build
 
@@ -52,7 +51,7 @@ LABEL maintainer="Grafana team <hello@grafana.com>"
 ARG GF_UID="472"
 ARG GF_GID="472"
 
-ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+ENV PATH="/usr/share/grafana/bin:$PATH" \
     GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
     GF_PATHS_DATA="/var/lib/grafana" \
     GF_PATHS_HOME="/usr/share/grafana" \