diff --git a/make-linux.mk b/make-linux.mk
index ab11cba10..cf30fbb0e 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -486,7 +486,10 @@ snap-upload-stable: FORCE
 		snapcraft upload --release=stable $${SNAPFILE};\
 	done
 
-synology: FORCE
-	./synology/build.sh build
+synology-pkg: FORCE
+	cd synology ; ./build.sh build
+
+synology-docker: FORCE
+	cd synology/dsm7-docker/; ./build.sh build
 
 FORCE:
diff --git a/synology/dsm7-docker/Dockerfile b/synology/dsm7-docker/Dockerfile
index f98a22a09..56fd0b448 100644
--- a/synology/dsm7-docker/Dockerfile
+++ b/synology/dsm7-docker/Dockerfile
@@ -2,19 +2,17 @@
 
 FROM alpine:latest as builder
 
-ARG COMMIT=04b77773c4cd384c359e3a48f40307b288233194
-
 RUN apk add --no-cache rust cargo
 RUN apk add  openssl-dev
 
 RUN apk add --update alpine-sdk linux-headers \
   && git clone --quiet https://github.com/zerotier/ZeroTierOne.git /src \
-  && git -C src reset --quiet --hard ${COMMIT} \
+  && git -C src reset --quiet --hard ${ZTO_COMMIT} \
   && cd /src \
   && make -f make-linux.mk
 
 FROM alpine:latest
-LABEL version="1.8.7"
+LABEL version=${ZTO_VER}
 LABEL description="ZeroTier One docker image for Synology NAS"
 
 RUN apk add --update --no-cache bash jq libc6-compat libstdc++
diff --git a/synology/dsm7-docker/build.sh b/synology/dsm7-docker/build.sh
index d55ef44f9..2b1fadd00 100755
--- a/synology/dsm7-docker/build.sh
+++ b/synology/dsm7-docker/build.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
-ZTO_VER=$(jq -r '.version' ../config.json)
+ZTO_VER=$(git describe --abbrev=0 --tags)
+ZTO_COMMIT=$(git rev-parse HEAD)
 
 build()
 {
-  sudo docker build --load --rm -t zerotier-synology .
+  sudo docker build --load --rm -t zerotier-synology . --build-arg ZTO_COMMIT=${ZTO_COMMIT} --build-arg ZTO_VER=${ZTO_VER}
   LATEST_DOCKER_IMAGE_HASH=$(sudo docker images -q zerotier-synology)
   sudo docker tag ${LATEST_DOCKER_IMAGE_HASH} zerotier/zerotier-synology:${ZTO_VER}
   sudo docker tag ${LATEST_DOCKER_IMAGE_HASH} zerotier/zerotier-synology:latest