diff --git a/Dockerfile b/Dockerfile
index 4b6ff6b..104042b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,9 +12,10 @@ WORKDIR /app
 COPY . .
 
 RUN cd server && CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-X 'main.Version=${COMMIT}' -X 'main.Commit=${COMMIT}' -X 'main.Date=${COMMIT}'" -o ../bin/arkd cmd/arkd/main.go
+RUN cd client && CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-X 'main.Version=${COMMIT}' -X 'main.Commit=${COMMIT}' -X 'main.Date=${COMMIT}'" -o ../bin/ark .
 
 # Second image, running the arkd executable
-FROM debian:buster-slim
+FROM alpine:3.12
 
 WORKDIR /app
 
@@ -22,9 +23,11 @@ COPY --from=builder /app/bin/* /app
 
 ENV PATH="/app:${PATH}"
 ENV ARK_DATADIR=/app/data
+ENV ARK_WALLET_DATADIR=/app/wallet-data
 
 # Expose volume containing all 'arkd' data
 VOLUME /app/data
+VOLUME /app/wallet-data
 
 ENTRYPOINT [ "arkd" ]
     
\ No newline at end of file
diff --git a/client/scripts/build b/client/scripts/build
index 2fd3930..2aa12b6 100755
--- a/client/scripts/build
+++ b/client/scripts/build
@@ -7,10 +7,20 @@ PARENT_PATH=$(dirname $(
 	pwd -P
 ))
 
-OS=$(eval "go env GOOS")
-ARCH=$(eval "go env GOARCH")
+if [[ -z $GOOS ]]; then
+	GOOS=$(eval "go env GOOS")
+fi
+
+if [[ -z $GOARCH ]]; then
+	GOARCH=$(eval "go env GOARCH")
+fi
+
+echo "Building for $GOOS $GOARCH"
 
 pushd $PARENT_PATH
 mkdir -p build
-GO111MODULE=on go build -ldflags="-s -w" -o build/ark-cli-$OS-$ARCH .
+
+
+GO111MODULE=on go build -ldflags="-s -w" -o build/ark-cli-$GOOS-$GOARCH .
+
 popd
diff --git a/client/scripts/build-all b/client/scripts/build-all
index 4bc5b6e..bf18a7f 100755
--- a/client/scripts/build-all
+++ b/client/scripts/build-all
@@ -11,12 +11,10 @@ declare -a OS=("darwin" "linux")
 declare -a ARCH=("amd64" "arm64")
 
 pushd $PARENT_PATH
-mkdir -p build
 
 for os in "${OS[@]}"; do
   for arch in "${ARCH[@]}"; do
-    echo "Building for $os $arch"
-    GOOS=$os GOARCH=$arch go build -o build/ark-$os-$arch .
+    GOOS=$os GOARCH=$arch ./scripts/build
   done
 done
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dddc516..447c796 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,6 +33,7 @@ services:
       - "6000:6000"
     volumes:
       - arkd:/app/data
+      - ark:/app/wallet-data
 
 volumes:
   oceand:
@@ -41,6 +42,8 @@ volumes:
     external: false
   arkd:
     external: false
+  ark:
+    external: false
 
 networks:
   default: