diff --git a/make-linux.mk b/make-linux.mk
index e902659c1..9f61deb31 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -498,17 +498,21 @@ snap-uninstall: FORCE
 	snap remove zerotier
 
 snap-build-remote: FORCE
-	snapcraft remote-build --build-on=amd64,arm64,s390x,ppc64el,armhf,i386
+	cd pkg && snapcraft remote-build --build-on=amd64,arm64,s390x,ppc64el,armhf,i386
 
 snap-upload-beta: FORCE
+	pushd pkg
 	for SNAPFILE in ./*.snap; do\
 		snapcraft upload --release=beta,edge,candidate $${SNAPFILE};\
 	done
+	popd
 
 snap-upload-stable: FORCE
+	pushd pkg
 	for SNAPFILE in ./*.snap; do\
 		snapcraft upload --release=stable $${SNAPFILE};\
 	done
+	popd
 
 synology-pkg: FORCE
 	cd pkg/synology ; ./build.sh build
diff --git a/pkg/snap/snapcraft.yaml b/pkg/snap/snapcraft.yaml
index 91bd3da74..57a2ed8e1 100644
--- a/pkg/snap/snapcraft.yaml
+++ b/pkg/snap/snapcraft.yaml
@@ -64,12 +64,14 @@ layout:
 
 parts:
   one:
-    source: ./
-    plugin: dump
-    organize:
-      zerotier-one : usr/sbin/zerotier-one
-      zerotier-cli : usr/sbin/zerotier-cli
-      zerotier-idtool : usr/sbin/zerotier-idtool
+    plugin: make
+    source: https://github.com/zerotier/zerotierone.git
+    source-branch: "master"
+    build-packages:
+      - build-essential
+      - libc++-dev
+    make-parameters:
+      - ZT_SSO_SUPPORTED=0
     filesets:
       binaries:
         - usr/sbin/zerotier-one