diff --git a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/alasia/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/alasia/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/alasia/zerotier/zerotier-identity-secret/machines/alasia b/vars/per-machine/alasia/zerotier/zerotier-identity-secret/machines/alasia
deleted file mode 120000
index 9f1fd15..0000000
--- a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/machines/alasia
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/alasia
\ No newline at end of file
diff --git a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/alasia/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/bosona/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/bosona/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/bosona/zerotier/zerotier-identity-secret/machines/bosona b/vars/per-machine/bosona/zerotier/zerotier-identity-secret/machines/bosona
deleted file mode 120000
index 29a0f55..0000000
--- a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/machines/bosona
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/bosona
\ No newline at end of file
diff --git a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/bosona/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/canopus/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/canopus/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/canopus/zerotier/zerotier-identity-secret/machines/canopus b/vars/per-machine/canopus/zerotier/zerotier-identity-secret/machines/canopus
deleted file mode 120000
index 4f5de1b..0000000
--- a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/machines/canopus
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/canopus
\ No newline at end of file
diff --git a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/canopus/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/deneb/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/deneb/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/deneb/zerotier/zerotier-identity-secret/machines/deneb b/vars/per-machine/deneb/zerotier/zerotier-identity-secret/machines/deneb
deleted file mode 120000
index b8f3750..0000000
--- a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/machines/deneb
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/deneb
\ No newline at end of file
diff --git a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/deneb/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/neptune/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/neptune/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/neptune/zerotier/zerotier-identity-secret/machines/neptune b/vars/per-machine/neptune/zerotier/zerotier-identity-secret/machines/neptune
deleted file mode 120000
index f1f22e2..0000000
--- a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/machines/neptune
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/neptune
\ No newline at end of file
diff --git a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/neptune/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/petra/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/petra/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/petra/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/petra/zerotier/zerotier-identity-secret/machines/petra b/vars/per-machine/petra/zerotier/zerotier-identity-secret/machines/petra
deleted file mode 120000
index 7a72f2e..0000000
--- a/vars/per-machine/petra/zerotier/zerotier-identity-secret/machines/petra
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/petra
\ No newline at end of file
diff --git a/vars/per-machine/petra/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/petra/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/petra/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/ramus/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/ramus/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/ramus/zerotier/zerotier-identity-secret/machines/ramus b/vars/per-machine/ramus/zerotier/zerotier-identity-secret/machines/ramus
deleted file mode 120000
index 21115e2..0000000
--- a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/machines/ramus
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/ramus
\ No newline at end of file
diff --git a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/ramus/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/rana/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/rana/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/rana/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/rana/zerotier/zerotier-identity-secret/machines/rana b/vars/per-machine/rana/zerotier/zerotier-identity-secret/machines/rana
deleted file mode 120000
index 215fc5f..0000000
--- a/vars/per-machine/rana/zerotier/zerotier-identity-secret/machines/rana
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/rana
\ No newline at end of file
diff --git a/vars/per-machine/rana/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/rana/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/rana/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/rigel/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/rigel/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/rigel/zerotier/zerotier-identity-secret/machines/rigel b/vars/per-machine/rigel/zerotier/zerotier-identity-secret/machines/rigel
deleted file mode 120000
index 47a146c..0000000
--- a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/machines/rigel
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/rigel
\ No newline at end of file
diff --git a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/rigel/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/sirius/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/sirius/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/sirius/zerotier/zerotier-identity-secret/machines/sirius b/vars/per-machine/sirius/zerotier/zerotier-identity-secret/machines/sirius
deleted file mode 120000
index 3c4ffbf..0000000
--- a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/machines/sirius
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/sirius
\ No newline at end of file
diff --git a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/sirius/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/vega/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/vega/zerotier/zerotier-identity-secret/groups/admins
deleted file mode 120000
index 6765aa1..0000000
--- a/vars/per-machine/vega/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/vega/zerotier/zerotier-identity-secret/machines/vega b/vars/per-machine/vega/zerotier/zerotier-identity-secret/machines/vega
deleted file mode 120000
index f8a757c..0000000
--- a/vars/per-machine/vega/zerotier/zerotier-identity-secret/machines/vega
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/vega
\ No newline at end of file
diff --git a/vars/per-machine/vega/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/vega/zerotier/zerotier-identity-secret/users/kurogeek
deleted file mode 120000
index 970aefa..0000000
--- a/vars/per-machine/vega/zerotier/zerotier-identity-secret/users/kurogeek
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-alasia/identity-secret/groups/admins b/vars/shared/zerotier-identity-alasia/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-alasia/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-alasia/identity-secret/machines/alasia b/vars/shared/zerotier-identity-alasia/identity-secret/machines/alasia
new file mode 120000
index 0000000..67f0481
--- /dev/null
+++ b/vars/shared/zerotier-identity-alasia/identity-secret/machines/alasia
@@ -0,0 +1 @@
+../../../../../sops/machines/alasia
\ No newline at end of file
diff --git a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-alasia/identity-secret/secret
similarity index 100%
rename from vars/per-machine/alasia/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-alasia/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-alasia/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-alasia/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-alasia/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-bosona/identity-secret/groups/admins b/vars/shared/zerotier-identity-bosona/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-bosona/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-bosona/identity-secret/machines/bosona b/vars/shared/zerotier-identity-bosona/identity-secret/machines/bosona
new file mode 120000
index 0000000..8a0c95e
--- /dev/null
+++ b/vars/shared/zerotier-identity-bosona/identity-secret/machines/bosona
@@ -0,0 +1 @@
+../../../../../sops/machines/bosona
\ No newline at end of file
diff --git a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-bosona/identity-secret/secret
similarity index 100%
rename from vars/per-machine/bosona/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-bosona/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-bosona/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-bosona/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-bosona/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-canopus/identity-secret/groups/admins b/vars/shared/zerotier-identity-canopus/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-canopus/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-canopus/identity-secret/machines/canopus b/vars/shared/zerotier-identity-canopus/identity-secret/machines/canopus
new file mode 120000
index 0000000..e89a7a3
--- /dev/null
+++ b/vars/shared/zerotier-identity-canopus/identity-secret/machines/canopus
@@ -0,0 +1 @@
+../../../../../sops/machines/canopus
\ No newline at end of file
diff --git a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-canopus/identity-secret/secret
similarity index 100%
rename from vars/per-machine/canopus/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-canopus/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-canopus/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-canopus/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-canopus/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-deneb/identity-secret/groups/admins b/vars/shared/zerotier-identity-deneb/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-deneb/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-deneb/identity-secret/machines/deneb b/vars/shared/zerotier-identity-deneb/identity-secret/machines/deneb
new file mode 120000
index 0000000..abd7320
--- /dev/null
+++ b/vars/shared/zerotier-identity-deneb/identity-secret/machines/deneb
@@ -0,0 +1 @@
+../../../../../sops/machines/deneb
\ No newline at end of file
diff --git a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-deneb/identity-secret/secret
similarity index 100%
rename from vars/per-machine/deneb/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-deneb/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-deneb/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-deneb/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-deneb/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-neptune/identity-secret/groups/admins b/vars/shared/zerotier-identity-neptune/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-neptune/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-neptune/identity-secret/machines/neptune b/vars/shared/zerotier-identity-neptune/identity-secret/machines/neptune
new file mode 120000
index 0000000..a786e40
--- /dev/null
+++ b/vars/shared/zerotier-identity-neptune/identity-secret/machines/neptune
@@ -0,0 +1 @@
+../../../../../sops/machines/neptune
\ No newline at end of file
diff --git a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-neptune/identity-secret/secret
similarity index 100%
rename from vars/per-machine/neptune/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-neptune/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-neptune/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-neptune/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-neptune/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-petra/identity-secret/groups/admins b/vars/shared/zerotier-identity-petra/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-petra/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-petra/identity-secret/machines/petra b/vars/shared/zerotier-identity-petra/identity-secret/machines/petra
new file mode 120000
index 0000000..21018d9
--- /dev/null
+++ b/vars/shared/zerotier-identity-petra/identity-secret/machines/petra
@@ -0,0 +1 @@
+../../../../../sops/machines/petra
\ No newline at end of file
diff --git a/vars/per-machine/petra/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-petra/identity-secret/secret
similarity index 100%
rename from vars/per-machine/petra/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-petra/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-petra/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-petra/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-petra/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-ramus/identity-secret/groups/admins b/vars/shared/zerotier-identity-ramus/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-ramus/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-ramus/identity-secret/machines/ramus b/vars/shared/zerotier-identity-ramus/identity-secret/machines/ramus
new file mode 120000
index 0000000..6755b15
--- /dev/null
+++ b/vars/shared/zerotier-identity-ramus/identity-secret/machines/ramus
@@ -0,0 +1 @@
+../../../../../sops/machines/ramus
\ No newline at end of file
diff --git a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-ramus/identity-secret/secret
similarity index 100%
rename from vars/per-machine/ramus/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-ramus/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-ramus/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-ramus/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-ramus/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-rana/identity-secret/groups/admins b/vars/shared/zerotier-identity-rana/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-rana/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-rana/identity-secret/machines/rana b/vars/shared/zerotier-identity-rana/identity-secret/machines/rana
new file mode 120000
index 0000000..30a401e
--- /dev/null
+++ b/vars/shared/zerotier-identity-rana/identity-secret/machines/rana
@@ -0,0 +1 @@
+../../../../../sops/machines/rana
\ No newline at end of file
diff --git a/vars/per-machine/rana/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-rana/identity-secret/secret
similarity index 100%
rename from vars/per-machine/rana/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-rana/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-rana/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-rana/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-rana/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-rigel/identity-secret/groups/admins b/vars/shared/zerotier-identity-rigel/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-rigel/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-rigel/identity-secret/machines/rigel b/vars/shared/zerotier-identity-rigel/identity-secret/machines/rigel
new file mode 120000
index 0000000..ea0fd4f
--- /dev/null
+++ b/vars/shared/zerotier-identity-rigel/identity-secret/machines/rigel
@@ -0,0 +1 @@
+../../../../../sops/machines/rigel
\ No newline at end of file
diff --git a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-rigel/identity-secret/secret
similarity index 100%
rename from vars/per-machine/rigel/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-rigel/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-rigel/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-rigel/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-rigel/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-sirius/identity-secret/groups/admins b/vars/shared/zerotier-identity-sirius/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-sirius/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-sirius/identity-secret/machines/sirius b/vars/shared/zerotier-identity-sirius/identity-secret/machines/sirius
new file mode 120000
index 0000000..78c64a5
--- /dev/null
+++ b/vars/shared/zerotier-identity-sirius/identity-secret/machines/sirius
@@ -0,0 +1 @@
+../../../../../sops/machines/sirius
\ No newline at end of file
diff --git a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-sirius/identity-secret/secret
similarity index 100%
rename from vars/per-machine/sirius/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-sirius/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-sirius/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-sirius/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-sirius/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-vega/identity-secret/groups/admins b/vars/shared/zerotier-identity-vega/identity-secret/groups/admins
new file mode 120000
index 0000000..e7f39ba
--- /dev/null
+++ b/vars/shared/zerotier-identity-vega/identity-secret/groups/admins
@@ -0,0 +1 @@
+../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/shared/zerotier-identity-vega/identity-secret/machines/vega b/vars/shared/zerotier-identity-vega/identity-secret/machines/vega
new file mode 120000
index 0000000..f73d257
--- /dev/null
+++ b/vars/shared/zerotier-identity-vega/identity-secret/machines/vega
@@ -0,0 +1 @@
+../../../../../sops/machines/vega
\ No newline at end of file
diff --git a/vars/per-machine/vega/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-vega/identity-secret/secret
similarity index 100%
rename from vars/per-machine/vega/zerotier/zerotier-identity-secret/secret
rename to vars/shared/zerotier-identity-vega/identity-secret/secret
diff --git a/vars/shared/zerotier-identity-vega/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-vega/identity-secret/users/kurogeek
new file mode 120000
index 0000000..5190103
--- /dev/null
+++ b/vars/shared/zerotier-identity-vega/identity-secret/users/kurogeek
@@ -0,0 +1 @@
+../../../../../sops/users/kurogeek
\ No newline at end of file
diff --git a/vars/per-machine/alasia/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-alasia-b4l-network/ip/value
similarity index 100%
rename from vars/per-machine/alasia/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-alasia-b4l-network/ip/value
diff --git a/vars/per-machine/bosona/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-bosona-poy-network/ip/value
similarity index 100%
rename from vars/per-machine/bosona/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-bosona-poy-network/ip/value
diff --git a/vars/per-machine/canopus/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-canopus-glom-network/ip/value
similarity index 100%
rename from vars/per-machine/canopus/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-canopus-glom-network/ip/value
diff --git a/vars/per-machine/deneb/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-deneb-poy-network/ip/value
similarity index 100%
rename from vars/per-machine/deneb/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-deneb-poy-network/ip/value
diff --git a/vars/per-machine/neptune/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-neptune-b4l-network/ip/value
similarity index 100%
rename from vars/per-machine/neptune/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-neptune-b4l-network/ip/value
diff --git a/vars/per-machine/petra/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-petra-b4l-network/ip/value
similarity index 100%
rename from vars/per-machine/petra/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-petra-b4l-network/ip/value
diff --git a/vars/per-machine/ramus/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-ramus-glom-network/ip/value
similarity index 100%
rename from vars/per-machine/ramus/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-ramus-glom-network/ip/value
diff --git a/vars/per-machine/rana/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-rana-b4l-network/ip/value
similarity index 100%
rename from vars/per-machine/rana/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-rana-b4l-network/ip/value
diff --git a/vars/per-machine/rigel/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-rigel-b4l-network/ip/value
similarity index 100%
rename from vars/per-machine/rigel/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-rigel-b4l-network/ip/value
diff --git a/vars/per-machine/sirius/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-sirius-w-network/ip/value
similarity index 100%
rename from vars/per-machine/sirius/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-sirius-w-network/ip/value
diff --git a/vars/per-machine/vega/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-vega-glom-network/ip/value
similarity index 100%
rename from vars/per-machine/vega/zerotier/zerotier-ip/value
rename to vars/shared/zerotier-ip-vega-glom-network/ip/value
diff --git a/vars/per-machine/rigel/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-b4l-network/network-id/value
similarity index 100%
rename from vars/per-machine/rigel/zerotier/zerotier-network-id/value
rename to vars/shared/zerotier-network-b4l-network/network-id/value
diff --git a/vars/per-machine/vega/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-glom-network/network-id/value
similarity index 100%
rename from vars/per-machine/vega/zerotier/zerotier-network-id/value
rename to vars/shared/zerotier-network-glom-network/network-id/value
diff --git a/vars/per-machine/deneb/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-poy-network/network-id/value
similarity index 100%
rename from vars/per-machine/deneb/zerotier/zerotier-network-id/value
rename to vars/shared/zerotier-network-poy-network/network-id/value
diff --git a/vars/per-machine/sirius/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-w-network/network-id/value
similarity index 100%
rename from vars/per-machine/sirius/zerotier/zerotier-network-id/value
rename to vars/shared/zerotier-network-w-network/network-id/value