diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml
index 9fa4722d..73953a57 100644
--- a/docker-compose.accounts.yml
+++ b/docker-compose.accounts.yml
@@ -55,11 +55,9 @@ services:
       - mongo
 
   dashboard:
-    # uncomment "build" and comment out "image" to build from sources
-    # build:
-    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
-    #   dockerfile: ./packages/dashboard/Dockerfile
-    image: skynetlabs/dashboard
+    build:
+      context: ./packages/dashboard
+      dockerfile: Dockerfile
     container_name: dashboard
     restart: unless-stopped
     logging: *default-logging
@@ -79,11 +77,9 @@ services:
       - mongo
 
   dashboard-v2:
-    # uncomment "build" and comment out "image" to build from sources
-    # build:
-    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
-    #   dockerfile: ./packages/dashboard-v2/Dockerfile
-    image: skynetlabs/dashboard-v2
+    build:
+      context: ./packages/dashboard-v2
+      dockerfile: Dockerfile
     container_name: dashboard-v2
     restart: unless-stopped
     logging: *default-logging
diff --git a/packages/dashboard-v2/Dockerfile b/packages/dashboard-v2/Dockerfile
index 9fb4c604..70790cfa 100644
--- a/packages/dashboard-v2/Dockerfile
+++ b/packages/dashboard-v2/Dockerfile
@@ -2,21 +2,13 @@ FROM node:16.14.2-alpine
 
 WORKDIR /usr/app
 
-COPY packages/dashboard-v2/package.json \
-     packages/dashboard-v2/yarn.lock \
-     ./
+COPY package.json yarn.lock ./
 
 RUN yarn --frozen-lockfile
 
-COPY packages/dashboard-v2/static ./static
-COPY packages/dashboard-v2/src ./src
-COPY packages/dashboard-v2/gatsby*.js \
-     packages/dashboard-v2/postcss.config.js \
-     packages/dashboard-v2/tailwind.config.js \
-     ./
+COPY static ./static
+COPY src ./src
+COPY gatsby*.js ./
+COPY postcss.config.js tailwind.config.js ./
 
-RUN yarn build
-
-EXPOSE 9000
-
-CMD ["sh", "-c", "yarn serve --host 0.0.0.0 -p 9000"]
+CMD ["sh", "-c", "yarn build && yarn serve --host 0.0.0.0 -p 9000"]
diff --git a/packages/dashboard/Dockerfile b/packages/dashboard/Dockerfile
index 25f584b3..39707664 100644
--- a/packages/dashboard/Dockerfile
+++ b/packages/dashboard/Dockerfile
@@ -2,19 +2,14 @@ FROM node:16.14.2-alpine
 
 WORKDIR /usr/app
 
-COPY packages/dashboard/package.json \
-     packages/dashboard/yarn.lock \
-     ./
+COPY package.json yarn.lock ./
 
 ENV NEXT_TELEMETRY_DISABLED 1
 RUN yarn --frozen-lockfile
 
-COPY packages/dashboard/public ./public
-COPY packages/dashboard/src ./src
-COPY packages/dashboard/styles ./styles
-COPY packages/dashboard/.eslintrc.json \
-     packages/dashboard/postcss.config.js \
-     packages/dashboard/tailwind.config.js \
-     ./
+COPY public ./public
+COPY src ./src
+COPY styles ./styles
+COPY .eslintrc.json postcss.config.js tailwind.config.js ./
 
 CMD ["sh", "-c", "env | grep -E 'NEXT_PUBLIC|STRIPE|ACCOUNTS' > .env.local && yarn build && yarn start"]