diff --git a/lxc3/rustdesk/rustdesk-hbbr-relayserver.yml b/lxc3/rustdesk/rustdesk-hbbr-relayserver.yml
index 9921240..4444bae 100644
--- a/lxc3/rustdesk/rustdesk-hbbr-relayserver.yml
+++ b/lxc3/rustdesk/rustdesk-hbbr-relayserver.yml
@@ -2,11 +2,11 @@ services:
   hbbr: # Relay Server
     container_name: hbbr
     image: rustdesk/rustdesk-server:latest
-    command: hbbr -k _
+    command: hbbr
     volumes:
-      - /docker/rustdesk/data:/root
+      - /docker/rustdesk/data:/data
     network_mode: host # REQUIRED if hbbs is on host network
     environment:
-      - KEY_PRIVATE=C+8aYs5uf3/Fl78CqcS5aRcl6DjTOfRAL4HVeDQnHiWsw+Zk84oIsmN2UFuw35OWUEYl3nL7mjiq08nt811i6g==
-      - KEY_PUBLIC=rMPmZPOKCLJjdlBbsN+TllBGJd5y+5o4qtPJ7fNdYuo=
+      - KEY_PRIVATE=${RUSTDESK_PRIVATE_KEY}
+      - KEY_PUBLIC=${RUSTDESK_PUBLIC_KEY}
     restart: unless-stopped
diff --git a/lxc3/rustdesk/rustdesk-hbbs-idserver.yml b/lxc3/rustdesk/rustdesk-hbbs-idserver.yml
index 28e9bed..5791667 100644
--- a/lxc3/rustdesk/rustdesk-hbbs-idserver.yml
+++ b/lxc3/rustdesk/rustdesk-hbbs-idserver.yml
@@ -2,11 +2,11 @@ services:
   hbbs: # ID Server
     container_name: hbbs
     image: rustdesk/rustdesk-server:latest
-    command: hbbs -r rustdesk.mapletree.email:21117 -k _
+    command: hbbs -r rustdesk.mapletree.email:21117
     volumes:
-      - /docker/rustdesk/data:/root
+      - /docker/rustdesk/data:/data
     network_mode: host # REQUIRED for best performance/hole-punching
     environment:
-      - KEY_PRIVATE=C+8aYs5uf3/Fl78CqcS5aRcl6DjTOfRAL4HVeDQnHiWsw+Zk84oIsmN2UFuw35OWUEYl3nL7mjiq08nt811i6g==
-      - KEY_PUBLIC=rMPmZPOKCLJjdlBbsN+TllBGJd5y+5o4qtPJ7fNdYuo=
+      - KEY_PRIVATE=${RUSTDESK_PRIVATE_KEY}
+      - KEY_PUBLIC=${RUSTDESK_PUBLIC_KEY}
     restart: unless-stopped