diff --git a/modules/element-calling.nix b/modules/element-calling.nix
index 75e0715..ce5a2b8 100755
--- a/modules/element-calling.nix
+++ b/modules/element-calling.nix
@@ -42,6 +42,7 @@ lib.mkIf config.sovran_systemsOS.features.element-calling {
   services.livekit = {
     enable = true;
     openFirewall = true;
+    package = pkgs.livekit;
     settings = {
       rtc.use_external_ip = true;
       rtc.udp_port = "7882-7894";
@@ -64,13 +65,10 @@ lib.mkIf config.sovran_systemsOS.features.element-calling {
   ];
 
   ####### JWT SERVICE #######
-  
-  environment.systemPackages = with pkgs; [
-    lk-jwt-service 
-  ];
 
   services.lk-jwt-service = {
     enable = true;
+    package = pkgs.lk-jwt-service;
     port = 8073;
     livekitUrl = "wss://${personalization.element-calling_url}";
     keyFile = "/var/lib/livekit/livekit_keyFile";