diff --git a/vars/per-machine/gw-cnx-1/emergency-access/password/groups/admins b/vars/per-machine/gw-cnx-1/emergency-access/password/groups/admins
new file mode 120000
index 0000000..6765aa1
--- /dev/null
+++ b/vars/per-machine/gw-cnx-1/emergency-access/password/groups/admins
@@ -0,0 +1 @@
+../../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/per-machine/gw-cnx-1/emergency-access/password/secret b/vars/per-machine/gw-cnx-1/emergency-access/password/secret
index 1f9a432..c1ad06c 100644
--- a/vars/per-machine/gw-cnx-1/emergency-access/password/secret
+++ b/vars/per-machine/gw-cnx-1/emergency-access/password/secret
@@ -3,12 +3,17 @@
 	"sops": {
 		"age": [
 			{
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IHFWcTVydyBBNHQyTnZq\nK3dQZDBhR2RsakliWVlLMEowSlNaTEwwb1lNcXRzeldRNTZQdwpHSEtSYmxCMmQ1\nRHQ2MnBZaTV4Nkk1cjJhRVdxWlRXdThCeHR2UThPdnVFCi0tLSBZMnlVUkJ6L1pv\nc28vSkZEblhNamoySmVxRE9VUDJqNmROM1ZUeUF6cXU0CslvET5GgJNVopDr1rAm\nRXaS0hGETMA2L9ui7ozIjccFcntx+JiRgr9N70PYrpqnl7JEjVLtrqsEXBQl8rIG\nWKA=\n-----END AGE ENCRYPTED FILE-----\n",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IHFWcTVydyBBOWVrRjh2\nZjgxSHdYeUFkRFVLRjc0WVZPNjFoU0wyMnB3cDU3ODJLeU4rQwpxdXRLOWtuMEhx\nR0NROE5xeHdBL1NhQ3NrSlQ5eUE0OGcrcGt6NGdRdTRvCi0tLSA2aDdydHB2TWpR\nQ09kakg3V09iNHpvdVYxck9DeVgwMFhMZ2g5cUxyWXo0CleMojWF4rB5GlAAM1D1\nKEES65mAa/3GPM0vHhd/YBwwyzyv4HeZHSVao5O10FzMWc226Rc029nhNwcTAlA7\nphU=\n-----END AGE ENCRYPTED FILE-----\n",
 				"recipient": "age1yubikey1qd859y9ehz2ya8j2cftwrtmdeqhuk7r7yc52zp64wpff6068gwrac3q6nsa"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5aFlkMktXRlIxZE8xTXNL\nRzFzWisrQkxEYXJ4STU5VkxZN2d0QjN2V0hrCnZxalRXZno3bk9TUG9oWFhnVkZM\nT3VLK1lLMWNtaHZ3Qk5odm9rRXFRTVEKLS0tIGd2K3ZNZUxoQXROVng0b1c0UU1r\nUWJxWnpCeWxEK3A2SnNBWjAxczZkeWcKOl+DtJQkkKaS1YYaDzqmasnxiY8iEuAd\n57f0zP+peA9Q4U3TZg3UGG94V9kuweNMTWPfj1GZvwBvZP9sZYuFYw==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1hlzrpqqgndcthq5m5yj9egfgyet2fzrxwa6ynjzwx2r22uy6m3hqr3rd06"
 			}
 		],
 		"lastmodified": "2026-07-28T09:03:14Z",
 		"mac": "ENC[AES256_GCM,data:8lemWJvcdPy0sg0K+Zn9A7xWd5X4q3XGTb+R5DiJMSo8BWxpP+QGNqxEuni8sNxP2d0bkrsEI3vG89lx37x3iot667Gds0qAaHq7h8l+3iwAvGMXAEzwIms9GLdIcJiUWYlFiAcicfUINWtPQ+adxACFzTOBIBEGqD6iQ5B+KsM=,iv:OuBeq83CopTNeJJM/UHUrI7RKIGVJ3tM+DcckuFxLBc=,tag:JAXpfqwSDRr4e58wiJeMNQ==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
 		"version": "3.13.1"
 	}
 }
diff --git a/vars/per-machine/gw-cnx-1/openssh/ssh.id_ed25519/groups/admins b/vars/per-machine/gw-cnx-1/openssh/ssh.id_ed25519/groups/admins
new file mode 120000
index 0000000..6765aa1
--- /dev/null
+++ b/vars/per-machine/gw-cnx-1/openssh/ssh.id_ed25519/groups/admins
@@ -0,0 +1 @@
+../../../../../../sops/groups/admins
\ No newline at end of file
diff --git a/vars/per-machine/gw-cnx-1/openssh/ssh.id_ed25519/secret b/vars/per-machine/gw-cnx-1/openssh/ssh.id_ed25519/secret
index eace5fc..1050d09 100644
--- a/vars/per-machine/gw-cnx-1/openssh/ssh.id_ed25519/secret
+++ b/vars/per-machine/gw-cnx-1/openssh/ssh.id_ed25519/secret
@@ -3,16 +3,21 @@
 	"sops": {
 		"age": [
 			{
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMNHVLNFNsbVAvSVZtdnpx\nZHZBdHFDK2kyb2tQZHR2MTB3QjFqU25wQnpRCmtkNWRRRlc5SThkM2lORmZzRTIv\nbTdRUko5MjhXVHpQUHphS0FhL2JJMWcKLS0tIHhVdU1uZUFUcTdNcmtFZTRZMHNR\nMWdkc1lYWk9zSG1uTzJ6MlBWdSsvQU0KEil7zgno2cul74In/2suECcPCqlyU5o7\nxXCri7zG8SsocoDs7rAqjl5vuCe4HnaUeRc6X/ljpGofcV4U4f7HMw==\n-----END AGE ENCRYPTED FILE-----\n",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBld0NYcG9weENnN1JadG5G\nSFVPQzE1TG1POFc0RFZnSk5PbWZJNWpFY2tjCnBxdWM1R0kvOXUzUCtqUjMxcjMr\nQ2Rsd2d1QWd2bzZxaUN4VTAwdHZPSHcKLS0tIFhWNmZYSzJhR255NFRFa1VBcWtK\nVXF1YTVRVVVMLzVMQ0l2RnJLVDVWVU0KMGbb1Nnw5eEDFpGGi0Y3Dr15J6lyLeKY\n4hQJN4gEYcBokEbAV3wTYbkDQqDuQ1dKfS+zgybA1pomKcubkDCWlQ==\n-----END AGE ENCRYPTED FILE-----\n",
 				"recipient": "age1g8a6fqhqg8q8qu4jyuhxc7hf00t5qvra55chyfm0qk45wlmvc9qs2cft8t"
 			},
 			{
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IHFWcTVydyBBcWswZWdD\naCt3ajJFb3BQVkI4WmRsV0hxODNlaU9nbFR2VWpyeDRxSlZGWgp0bU9xcm9yS2k5\nWC9TSW9YbXBhYnVLell3SHJwMndMbVhLMFd1S21BdUFjCi0tLSBUeVorWDhLNkpC\nekRHUnpJU09iQnBDbzUvKzNQMGs1NEFwV2xrdldYVVZNCk5hsEvHdvCW89rd0k+m\nPc+r9EdxjBvd3mw2EI85YBgdRPQdSDBoeI6/WzhFi39GsWycyR5gjOAsBFY7j/fk\nR7s=\n-----END AGE ENCRYPTED FILE-----\n",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IHFWcTVydyBBK2E4TWdr\nTCttMjFmN1NMRWQ4YmpUZGNWa3NWTkJWUnRJSEthcnJncEhSRgpFTGx5L1VDSVhY\nWE1Udmt5NUkyOHdTd0JqUmlxdGt6UFEyK3RHakNHVklBCi0tLSBVbVFQSWMxdGlj\nTmdSN3Q3NVZaOVRWQk03K1o5WmphMGFFNHUwOGdCcUV3CmqsQ6E3U20tvO0ciXqb\nUIdmcfuy7u4SGQY4qskEefYQrn1TaD/zVM9yL+Uw6GvxxSnKeytgkwxnCTTjh10C\nVB0=\n-----END AGE ENCRYPTED FILE-----\n",
 				"recipient": "age1yubikey1qd859y9ehz2ya8j2cftwrtmdeqhuk7r7yc52zp64wpff6068gwrac3q6nsa"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSOWVZT0hRQWJiSG9OcFg3\ndm9rN0ZyZm45MGE1bDJ0N3dFWi9BV0R2WGhNClY1MmZsSWxESFljM3FQTFlkSlha\nenF2QkRmU3VSTWNqOG5qeEU4TXA5U3MKLS0tIENlNXpvRHJIQk83Q3ZIV24rdGU0\nWFB5NllWTU1ldUtNWmNGN21XMXBYZGsKhlAkMshZJjY48PBgAd8W7JAISnC/BGjL\n4sZez/+Qnz06y/ZyvatV3yIDmUTvp2jSqFzvwvDBeHuuAowpa6Yg4w==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1hlzrpqqgndcthq5m5yj9egfgyet2fzrxwa6ynjzwx2r22uy6m3hqr3rd06"
 			}
 		],
 		"lastmodified": "2026-07-28T09:03:14Z",
 		"mac": "ENC[AES256_GCM,data:07tbbE0nqs0P0svDnzg5f6bPklOjTVFLGIsDc+ozllTU3VLYWHwvvkdgoJbPDaFH5mXykK6JyMZiI5jorx8iG/0+3s1bVMR0lCom7cXOqzai/h5meFZ8ymkON0cVXqTfwy7QTAlxg7ysjAqHLvJlHorTNFVUjxZelfDapa4g/ew=,iv:0SdRCRUcD+QxSZdOrzJ6Ri3eK1rvysFWDOrxSNc/5B8=,tag:c6R5gzhvlaBOl+J8zNjiOw==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
 		"version": "3.13.1"
 	}
 }