diff --git a/Dockerfile b/Dockerfile
index 9ff2e18..d9c54fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,18 @@
-FROM golang:1.16-buster as server
+# Step 1: build executable binary
+FROM golang:1.16-buster as builder
 WORKDIR /app
 
-#
-# install dependencies
-#RUN set -eux; apt-get update; \
-#    apt-get install -y --no-install-recommends;
-#    #
-#    # clean up
-#    apt-get clean -y; \
-#    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# build server
 COPY . .
-
 RUN go get -v -t -d .; \
-    ./build
+    go build -o bin/neko_rooms cmd/neko_rooms/main.go
 
-ENTRYPOINT [ "bin/neko_rooms" ]
+# Step 2: build a small image
+#FROM scratch
+#COPY --from=builder /app/bin/neko_rooms /app/bin/neko_rooms
+
+ENV DOCKER_API_VERSION=1.39
+ENV NEKO_ROOMS_BIND=:8080
+EXPOSE 8080
+
+ENTRYPOINT [ "/app/bin/neko_rooms" ]
 CMD [ "serve" ]
diff --git a/dev/build b/dev/build
index b19af99..9f5dd06 100755
--- a/dev/build
+++ b/dev/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd "$(dirname "$0")"
 
-docker build -t neko_rooms_img ..
+docker build  --target builder -t neko_rooms_img ..
 
 ./rebuild