diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index c6f73e6..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM golang:1.14.6-alpine3.12
-RUN mkdir /dione
-COPY . /dione
-WORKDIR /dione
-
-RUN apk add git
-RUN apk add --update make
-RUN go mod download
-
-RUN make build
-
-CMD ["./dione"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 357992b..2bea323 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,3 @@
 dione:
     build: .
-    working_dir: /go/src
-    ports:
-     - "5000:5000"
-    links:
-     - redisDB
-redisDB:
-    image: redis
-    ports:
-     - "6379:6379"
\ No newline at end of file
+    dockerfile: ./docker/Dockerfile
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..6ecf311
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,18 @@
+FROM golang:1.16.6-alpine3.14 as builder
+
+RUN mkdir /app
+COPY . /app
+WORKDIR /app
+
+RUN apk add build-base
+RUN apk add linux-headers
+RUN go mod download
+
+RUN go build -v ./cmd/dione/dione.go
+
+FROM alpine:latest
+WORKDIR /app
+COPY --from=builder /app/dione .
+COPY docker/entrypoint.sh .
+RUN chmod +x /app/entrypoint.sh
+CMD ["/app/entrypoint.sh"]
\ No newline at end of file
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100644
index 0000000..e8e0d3c
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -z "$CONFIG_PATH" ]; then
+    echo "Config path is required!"
+    exit 1
+fi
+
+/app/dione -config "$CONFIG_PATH"
\ No newline at end of file