diff --git a/modules/application-groups/android.nix b/modules/application-groups/android.nix
index df68489..5b19520 100644
--- a/modules/application-groups/android.nix
+++ b/modules/application-groups/android.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
 {
   programs.adb.enable = true;
-  virtualisation.waydroid.enable = true;
 }
diff --git a/modules/application-groups/virtualization.nix b/modules/application-groups/virtualization.nix
index 385dace..7e25576 100644
--- a/modules/application-groups/virtualization.nix
+++ b/modules/application-groups/virtualization.nix
@@ -3,6 +3,7 @@
   virtualisation.podman = {
     enable = true;
     dockerCompat = true;
+    dockerSocket.enable = true;
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/users/caperren/caperren.nix b/users/caperren/caperren.nix
index 6dd8754..fe5e10d 100644
--- a/users/caperren/caperren.nix
+++ b/users/caperren/caperren.nix
@@ -13,12 +13,13 @@ in
     isNormalUser = true;
     description = "Corwin Perren";
     extraGroups = [
-      "networkmanager"
-      "wheel"
-      "input"
-      "dialout"
-      "plugdev"
       "adbusers"
+      "dialout"
+      "input"
+      "networkmanager"
+      "plugdev"
+      "podman"
+      "wheel"
     ];
   };
 
@@ -90,7 +91,7 @@ in
     # Custom bash aliases
     home.shellAliases = {
       # Phone remote desktop over usb (adb), with some default flags I want
-      phonerdp = "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake";
+      phonerdp = "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake --power-off-on-close";
 
       # Streamdeck isn't easy to manually edit, so make a save command to copy any updates to the repo
       savestreamdeck = "cp ~/.streamdeck_ui.json ~/.nixos-configs/users/caperren/dotfiles/streamdeck/.streamdeck_ui.json";
diff --git a/users/caperren/dotfiles/.local/share/applications/phonerdp.desktop b/users/caperren/dotfiles/.local/share/applications/phonerdp.desktop
index 0c16e77..fe8e82c 100644
--- a/users/caperren/dotfiles/.local/share/applications/phonerdp.desktop
+++ b/users/caperren/dotfiles/.local/share/applications/phonerdp.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Phone RDP
-Exec=bash -c "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake"
+Exec=bash -c "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake --power-off-on-close"
 Icon=phonerdp
 Terminal=false
 Categories=Utilities;
\ No newline at end of file