diff --git a/roles/desktop/defaults/main.yml b/roles/desktop/defaults/main.yml
index 52c8c68..14ecd7c 100644
--- a/roles/desktop/defaults/main.yml
+++ b/roles/desktop/defaults/main.yml
@@ -35,7 +35,8 @@ desktop_apt_repos:
   - "deb https://baltocdn.com/helm/stable/debian/ all main" # Helm
   - "deb [arch=amd64] https://apt.releases.hashicorp.com focal main" # Terraform
     # First-party PPAs
-  - "ppa:jackmacwindows/ppa" # CraftOS-PC 2
+  # Disabled due to lack of 22.04 support. Not a real dealbreaker
+  #- "ppa:jackmacwindows/ppa" # CraftOS-PC 2
   - "ppa:phoerious/keepassxc" # KeepassXC
   - "ppa:libretro/stable" # Libretro
 desktop_apt_repos_extra: []
@@ -68,7 +69,6 @@ desktop_apt_packages:
   - npm                                 # I'm sorry
   - openjdk-8-jre                       # Used for Minecraft
   - openjdk-11-jre
-  - openjdk-16-jre
   - pwgen                               # Useful basic utility
   - python3-appdirs                     # Various python libraries for scripts, mostly fuselee-gelee
   - python3-eyed3