diff --git a/README.md b/README.md
index a08e30e..ed4c20d 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ That's it.
 
 Two ways of doing this:
   1. Install all the tech stack on your local machine
-  2. Use docker-compose
+  2. Use docker-compose (TODO)
 
 See README files on each project directory for further instruction on how to run the development environment.
 
diff --git a/api/Dockerfile b/api/Dockerfile
new file mode 100644
index 0000000..501bf0e
--- /dev/null
+++ b/api/Dockerfile
@@ -0,0 +1,10 @@
+FROM golang:1.16.5-buster
+
+WORKDIR /app
+
+COPY . .
+
+RUN go mod download -v
+RUN go build -v main.go
+
+CMD ["main"]
\ No newline at end of file
diff --git a/client/Dockerfile b/client/Dockerfile
new file mode 100644
index 0000000..a907119
--- /dev/null
+++ b/client/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:14.17.3-buster
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm install -g yarn
+RUN yarn install
+RUN yarn build
+
+CMD ["yarn", "preview"]
\ No newline at end of file
diff --git a/heroku.yml b/heroku.yml
index e24b4a6..825aef7 100644
--- a/heroku.yml
+++ b/heroku.yml
@@ -1,4 +1,3 @@
 build:
-  web: cd api && go build -v main.go
-run:
-  web: ./api/main
\ No newline at end of file
+  docker:
+    web: api/Dockerfile
\ No newline at end of file