diff --git a/docker/Dockerfile b/docker/Dockerfile
index 70fe95f1..897d2cd3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,6 +4,11 @@ MAINTAINER support@bluzelle.com
 # Set up dependencies
 ENV PACKAGES make git bash gcc
 
+ENV GO111MODULE=on \
+    CGO_ENABLED=0 \
+    GOOS=linux \
+    GOARCH=amd64
+
 # Set working directory for the build
 WORKDIR /go/src/github.com/bluzelle/
 
@@ -26,6 +31,9 @@ RUN apk add --update ca-certificates
 
 WORKDIR /root
 
+EXPOSE 26656
+EXPOSE 1317
+
 # Copy over binaries from the build-env
 COPY --from=build-env /go/bin/blzd /usr/bin/blzd
 COPY --from=build-env /go/bin/blzcli /usr/bin/blzcli
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3acfc73c..c683fc4b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,26 +2,36 @@ version: '3'
 
 services:
   swarm01:
+    build:
+      context: .
+      dockerfile: Dockerfile
     image: bluzelle-curium:latest
     ports:
       - "26656:26656"
       - "1317:1317"
     environment:
       NODE_NAME: "swarm01"
-    networks:
-      - swarmnet
+      LOCAL_IP: ${LOCAL_IP}
     expose:
       - "26656"
       - "1317"
-
-  swarm02:
-    image: bluzelle-curium:latest
-    environment:
-      NODE_NAME: "swarm02"
-      LOCAL_IP: ${LOCAL_IP}
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "50m"
+        max-file: "10"
+    restart: unless-stopped
     networks:
       - swarmnet
 
+  # swarm02:
+  #   image: bluzelle-curium:latest
+  #   environment:
+  #     NODE_NAME: "swarm02"
+  #     LOCAL_IP: ${LOCAL_IP}
+  #   networks:
+  #     - swarmnet
+
   #swarm03:
   #   image: bluzelle-curium:latest
   #   environment: