diff --git a/Dockerfile b/Dockerfile
index a5e9e0b..edfae59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,10 @@
 FROM xena/go:1.13.5 AS build
 WORKDIR /wasmcloud
-COPY . .
 ENV GOPROXY https://cache.greedo.xeserv.us
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
+COPY . .
 RUN GOBIN=/wasmcloud/bin go install -tags=postgres ./cmd/...
 
 FROM xena/alpine
diff --git a/docker-compose.yml b/docker-compose.yml
index 53f1886..7da2d6d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,31 +1,34 @@
 version: '3.7'
 services:
-  ipfs:
-    image: "ipfs/go-ipfs:latest"
-    environment:
-      - IPFS_PROFILE=server
-    volumes:
-      - ipfs:/data/ipfs
   worker:
     deploy:
       replicas: 3
     restart: always
-    image: xena/wasmcloud
+    build: .
     environment:
       - IPFS_HOST=ipfs:5001
       - NATS_URL=nats://nats:4222
+      - WORKER_COUNT=16
     command: /usr/local/bin/wasmcloud-executor
+    depends_on:
+      - nats
+      - ipfs
   web:
     restart: always
-    image: xena/wasmcloud
+    build: .
     ports:
       - "3002:3002"
+    depends_on:
+      - nats
+      - postgres
+      - ipfs
     environment:
       - DATABASE_KIND=postgres
       - "DATABASE_URL=host=postgres port=5432 user=azurediamond dbname=wasmcloud password=hunter2 sslmode=disable"
       - NATS_URL=nats://nats:4222
       - IPFS_HOST=ipfs:5001
     command: /usr/local/bin/wasmcloudd
+
   postgres:
     image: "postgres:alpine"
     environment:
@@ -39,6 +42,12 @@ services:
     image: "nats:latest"
     ports:
       - 8222:8222
+  ipfs:
+    image: "ipfs/go-ipfs:latest"
+    environment:
+      - IPFS_PROFILE=server
+    volumes:
+      - ipfs:/data/ipfs
 
 volumes:
   ipfs: