diff --git a/vars/per-machine/control/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/control/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/control/zerotier/zerotier-identity-secret/groups/admins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/per-machine/control/zerotier/zerotier-identity-secret/machines/control b/vars/per-machine/control/zerotier/zerotier-identity-secret/machines/control
deleted file mode 120000
index 32ed094..0000000
--- a/vars/per-machine/control/zerotier/zerotier-identity-secret/machines/control
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/control
\ No newline at end of file
diff --git a/vars/per-machine/control/zerotier/zerotier-identity-secret/users/berwn b/vars/per-machine/control/zerotier/zerotier-identity-secret/users/berwn
deleted file mode 120000
index 57d4221..0000000
--- a/vars/per-machine/control/zerotier/zerotier-identity-secret/users/berwn
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/per-machine/mx1/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/mx1/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/mx1/zerotier/zerotier-identity-secret/groups/admins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/per-machine/mx1/zerotier/zerotier-identity-secret/machines/mx1 b/vars/per-machine/mx1/zerotier/zerotier-identity-secret/machines/mx1
deleted file mode 120000
index c063221..0000000
--- a/vars/per-machine/mx1/zerotier/zerotier-identity-secret/machines/mx1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/mx1
\ No newline at end of file
diff --git a/vars/per-machine/mx1/zerotier/zerotier-identity-secret/users/berwn b/vars/per-machine/mx1/zerotier/zerotier-identity-secret/users/berwn
deleted file mode 120000
index 57d4221..0000000
--- a/vars/per-machine/mx1/zerotier/zerotier-identity-secret/users/berwn
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/per-machine/ns1/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/ns1/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/ns1/zerotier/zerotier-identity-secret/groups/admins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/per-machine/ns1/zerotier/zerotier-identity-secret/machines/ns1 b/vars/per-machine/ns1/zerotier/zerotier-identity-secret/machines/ns1
deleted file mode 120000
index ef04008..0000000
--- a/vars/per-machine/ns1/zerotier/zerotier-identity-secret/machines/ns1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/ns1
\ No newline at end of file
diff --git a/vars/per-machine/ns1/zerotier/zerotier-identity-secret/users/berwn b/vars/per-machine/ns1/zerotier/zerotier-identity-secret/users/berwn
deleted file mode 120000
index 57d4221..0000000
--- a/vars/per-machine/ns1/zerotier/zerotier-identity-secret/users/berwn
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/per-machine/ns2/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/ns2/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/ns2/zerotier/zerotier-identity-secret/groups/admins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/per-machine/ns2/zerotier/zerotier-identity-secret/machines/ns2 b/vars/per-machine/ns2/zerotier/zerotier-identity-secret/machines/ns2
deleted file mode 120000
index 8e6cedd..0000000
--- a/vars/per-machine/ns2/zerotier/zerotier-identity-secret/machines/ns2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/ns2
\ No newline at end of file
diff --git a/vars/per-machine/ns2/zerotier/zerotier-identity-secret/users/berwn b/vars/per-machine/ns2/zerotier/zerotier-identity-secret/users/berwn
deleted file mode 120000
index 57d4221..0000000
--- a/vars/per-machine/ns2/zerotier/zerotier-identity-secret/users/berwn
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/per-machine/web01/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/web01/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/web01/zerotier/zerotier-identity-secret/groups/admins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/per-machine/web01/zerotier/zerotier-identity-secret/machines/web01 b/vars/per-machine/web01/zerotier/zerotier-identity-secret/machines/web01
deleted file mode 120000
index a75b0ec..0000000
--- a/vars/per-machine/web01/zerotier/zerotier-identity-secret/machines/web01
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/web01
\ No newline at end of file
diff --git a/vars/per-machine/web01/zerotier/zerotier-identity-secret/users/berwn b/vars/per-machine/web01/zerotier/zerotier-identity-secret/users/berwn
deleted file mode 120000
index 57d4221..0000000
--- a/vars/per-machine/web01/zerotier/zerotier-identity-secret/users/berwn
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-control/identity-secret/groups/admins b/vars/shared/zerotier-identity-control/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-control/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-control/identity-secret/machines/control b/vars/shared/zerotier-identity-control/identity-secret/machines/control
new file mode 120000
index 0000000..828a748
--- /dev/null
+++ b/vars/shared/zerotier-identity-control/identity-secret/machines/control
@@ -0,0 +1 @@
+../../../../../sops/machines/control
\ No newline at end of file
diff --git a/vars/per-machine/control/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-control/identity-secret/secret
similarity index 100%
rename from vars/per-machine/control/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-control/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-control/identity-secret/users/berwn b/vars/shared/zerotier-identity-control/identity-secret/users/berwn
new file mode 120000
index 0000000..cbe2a8d
--- /dev/null
+++ b/vars/shared/zerotier-identity-control/identity-secret/users/berwn
@@ -0,0 +1 @@
+../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-mx1/identity-secret/groups/admins b/vars/shared/zerotier-identity-mx1/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-mx1/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-mx1/identity-secret/machines/mx1 b/vars/shared/zerotier-identity-mx1/identity-secret/machines/mx1
new file mode 120000
index 0000000..639027f
--- /dev/null
+++ b/vars/shared/zerotier-identity-mx1/identity-secret/machines/mx1
@@ -0,0 +1 @@
+../../../../../sops/machines/mx1
\ No newline at end of file
diff --git a/vars/per-machine/mx1/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-mx1/identity-secret/secret
similarity index 100%
rename from vars/per-machine/mx1/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-mx1/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-mx1/identity-secret/users/berwn b/vars/shared/zerotier-identity-mx1/identity-secret/users/berwn
new file mode 120000
index 0000000..cbe2a8d
--- /dev/null
+++ b/vars/shared/zerotier-identity-mx1/identity-secret/users/berwn
@@ -0,0 +1 @@
+../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-ns1/identity-secret/groups/admins b/vars/shared/zerotier-identity-ns1/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-ns1/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-ns1/identity-secret/machines/ns1 b/vars/shared/zerotier-identity-ns1/identity-secret/machines/ns1
new file mode 120000
index 0000000..32d8929
--- /dev/null
+++ b/vars/shared/zerotier-identity-ns1/identity-secret/machines/ns1
@@ -0,0 +1 @@
+../../../../../sops/machines/ns1
\ No newline at end of file
diff --git a/vars/per-machine/ns1/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-ns1/identity-secret/secret
similarity index 100%
rename from vars/per-machine/ns1/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-ns1/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-ns1/identity-secret/users/berwn b/vars/shared/zerotier-identity-ns1/identity-secret/users/berwn
new file mode 120000
index 0000000..cbe2a8d
--- /dev/null
+++ b/vars/shared/zerotier-identity-ns1/identity-secret/users/berwn
@@ -0,0 +1 @@
+../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-ns2/identity-secret/groups/admins b/vars/shared/zerotier-identity-ns2/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-ns2/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-ns2/identity-secret/machines/ns2 b/vars/shared/zerotier-identity-ns2/identity-secret/machines/ns2
new file mode 120000
index 0000000..bd93648
--- /dev/null
+++ b/vars/shared/zerotier-identity-ns2/identity-secret/machines/ns2
@@ -0,0 +1 @@
+../../../../../sops/machines/ns2
\ No newline at end of file
diff --git a/vars/per-machine/ns2/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-ns2/identity-secret/secret
similarity index 100%
rename from vars/per-machine/ns2/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-ns2/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-ns2/identity-secret/users/berwn b/vars/shared/zerotier-identity-ns2/identity-secret/users/berwn
new file mode 120000
index 0000000..cbe2a8d
--- /dev/null
+++ b/vars/shared/zerotier-identity-ns2/identity-secret/users/berwn
@@ -0,0 +1 @@
+../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-web01/identity-secret/groups/admins b/vars/shared/zerotier-identity-web01/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-web01/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-web01/identity-secret/machines/web01 b/vars/shared/zerotier-identity-web01/identity-secret/machines/web01
new file mode 120000
index 0000000..37b8b7c
--- /dev/null
+++ b/vars/shared/zerotier-identity-web01/identity-secret/machines/web01
@@ -0,0 +1 @@
+../../../../../sops/machines/web01
\ No newline at end of file
diff --git a/vars/per-machine/web01/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-web01/identity-secret/secret
similarity index 100%
rename from vars/per-machine/web01/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-web01/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-web01/identity-secret/users/berwn b/vars/shared/zerotier-identity-web01/identity-secret/users/berwn
new file mode 120000
index 0000000..cbe2a8d
--- /dev/null
+++ b/vars/shared/zerotier-identity-web01/identity-secret/users/berwn
@@ -0,0 +1 @@
+../../../../../sops/users/berwn
\ No newline at end of file
diff --git a/vars/per-machine/control/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-control-zerotier/ip/value
similarity index 100%
rename from vars/per-machine/control/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-control-zerotier/ip/value
diff --git a/vars/per-machine/mx1/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-mx1-zerotier/ip/value
similarity index 100%
rename from vars/per-machine/mx1/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-mx1-zerotier/ip/value
diff --git a/vars/per-machine/ns1/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-ns1-zerotier/ip/value
similarity index 100%
rename from vars/per-machine/ns1/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-ns1-zerotier/ip/value
diff --git a/vars/per-machine/ns2/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-ns2-zerotier/ip/value
similarity index 100%
rename from vars/per-machine/ns2/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-ns2-zerotier/ip/value
diff --git a/vars/per-machine/web01/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-web01-zerotier/ip/value
similarity index 100%
rename from vars/per-machine/web01/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-web01-zerotier/ip/value
diff --git a/vars/per-machine/control/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-zerotier/network-id/value
similarity index 100%
rename from vars/per-machine/control/zerotier/zerotier-network-id/value
rename to vars/shared/zerotier-network-zerotier/network-id/value