diff --git a/docker-compose.yml b/docker-compose.yml
index 230e7f3d3068dc977a6ee294cac697f06768d28a..aab724889fd2b646e1dbe91db5e64bb0e05d9c9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,8 +19,12 @@ services:
       - ./.datastore/postgresql:/var/lib/postgresql/data
 
   backend:
+    platform: linux/amd64
     container_name: shellvalier-backend
     image: shellvalier-developer:latest
+    build:
+      context: .
+      dockerfile: Dockerfile
     depends_on:
       - postgresql
     networks:
@@ -34,6 +38,9 @@ services:
   frontend:
     container_name: shellvalier-frontend
     image: shellvalier-frontend-developer:latest
+    build:
+      context: .
+      dockerfile: Dockerfile-frontend
     networks:
       - app-tier
     volumes:
diff --git a/docker/scripts/run-docker b/docker/scripts/run-docker
index a9b6f529e275601178764ed4c79c90fc8951ada8..d1c8cb191f168ed10efe816cf262bb971c6f1eac 100755
--- a/docker/scripts/run-docker
+++ b/docker/scripts/run-docker
@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 set -e
-docker build -t shellvalier-developer -f Dockerfile .
-docker build -t shellvalier-frontend-developer -f Dockerfile-frontend .
-docker-compose up
+docker-compose up --build