diff --git a/deploy.sh b/deploy.sh
index dfecf08..f425fce 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -23,4 +23,4 @@ set -x
 system_drv=$(nix-instantiate "<nixpkgs/nixos>" -I $sources -I "nixos-config=$PWD/hosts/$host/configuration.nix" | head -n1)
 nix-copy-closure --to $target $system_drv
 system=$(ssh $target "nix-store --realise $system_drv")
-ssh $target "sudo nix-env -p /nix/var/nix/profiles/system -i $system && /nix/var/nix/profiles/system/bin/switch-to-configuration $mode"
+ssh $target "sudo nix-env -p /nix/var/nix/profiles/system -i $system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration $mode"
diff --git a/hosts/bemmer/configuration.nix b/hosts/bemmer/configuration.nix
index 5524352..62b02f7 100644
--- a/hosts/bemmer/configuration.nix
+++ b/hosts/bemmer/configuration.nix
@@ -7,14 +7,14 @@
     ../../common
 
     # services
-    #../../shared-services/pulseaudio.nix
+    ../../shared-services/pulseaudio.nix
     #../../shared-services/nfs-server.nix
-    #../../shared-services/mpd.nix
-    #../../shared-services/ympd.nix
-    #../../shared-services/spotifyd.nix
-    #../../shared-services/desktop.nix
-    #../../shared-services/vnc.nix
-    #../../shared-services/webserver.nix
+    ../../shared-services/mpd.nix
+    ../../shared-services/ympd.nix
+    ../../shared-services/spotifyd.nix
+    ../../shared-services/desktop.nix
+    ../../shared-services/vnc.nix
+    ../../shared-services/webserver.nix
   ];
   users.users.c3h = {
     isNormalUser = true;
@@ -36,7 +36,7 @@
 
   hardware.raspberry-pi."4" = {
     fkms-3d.enable = true;
-    audio.enable = true;
+    #audio.enable = true;
   };
 
   system.stateVersion = "21.05";
diff --git a/shared-services/pulseaudio.nix b/shared-services/pulseaudio.nix
index 7bb6565..cdc48fe 100644
--- a/shared-services/pulseaudio.nix
+++ b/shared-services/pulseaudio.nix
@@ -8,4 +8,5 @@
   hardware.pulseaudio.package = pkgs.pulseaudio;
   hardware.pulseaudio.tcp.enable = true;
   hardware.pulseaudio.tcp.anonymousClients.allowedIpRanges = [ "127.0.0.0/8" "::/64" "10.23.42.0/24" ];
+  environment.variables.PULSE_SERVER = "127.0.0.1";
 }