diff --git a/dev/host_vars/minecraft.yml b/dev/host_vars/minecraft.yml
index bed05d0..c98119a 100644
--- a/dev/host_vars/minecraft.yml
+++ b/dev/host_vars/minecraft.yml
@@ -10,8 +10,8 @@ manage_network: false
 minecraft_onboot: vanilla
 minecraft_onboot_run: true
 minecraft:
-  - name: vanilla # 1.16.5 (https://mcversions.net/download/1.16.5)
-    sha1: 1b557e7b033b583cd9f66746b7a9ab1ec1673ced
+  - name: vanilla # 1.17.1 (https://mcversions.net/download/1.17.1)
+    sha1: a16d67e5807f57fc4e550299cf20226194497dc2
     java:
       Xms: 1G
       Xmx: 1G
diff --git a/roles/minecraft/defaults/main.yml b/roles/minecraft/defaults/main.yml
index eb86c30..0148b01 100644
--- a/roles/minecraft/defaults/main.yml
+++ b/roles/minecraft/defaults/main.yml
@@ -1,6 +1,7 @@
 minecraft_eula: false
 minecraft_home: "/opt/minecraft"
-minecraft_java: 11
+minecraft_java: 16
+minecraft_java_pkg: "adoptopenjdk-{{ minecraft_java }}-hotspot"
 minecraft_modpack_url: "https://api.modpacks.ch/public/modpack/{{ item.modpack }}/server/linux"
 minecraft_onboot_run: false
 minecraft_url: "https://launcher.mojang.com/v1/objects/{{ item.sha1 }}/server.jar"
diff --git a/roles/minecraft/tasks/java.yml b/roles/minecraft/tasks/java.yml
index 6858f5b..d34f9bc 100644
--- a/roles/minecraft/tasks/java.yml
+++ b/roles/minecraft/tasks/java.yml
@@ -2,46 +2,35 @@
   apt:
     name: gpg
     state: present
-  when: item.java.version is defined and item.java.version == 8
-  loop: "{{ minecraft }}"
 
 - name: Add AdoptOpenJDK's signing key
   apt_key:
     id: 8ED17AF5D7E675EB3EE3BCE98AC3B29174885C03
     url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
-  when: item.java.version is defined and item.java.version == 8
-  loop: "{{ minecraft }}"
 
 - name: Install AdoptOpenJDK repository
   apt_repository:
     repo: deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main
     mode: 0644
     state: present
-  when: item.java.version is defined and item.java.version == 8
-  loop: "{{ minecraft }}"
 
-- name: Install Java 8
+- name: Install Java
   apt:
-    name: adoptopenjdk-8-hotspot
+    name: "adoptopenjdk-{{ item.java.version }}-hotspot"
     state: present
-  when: item.java.version is defined and item.java.version == 8
+  when: item.java.version is defined
   loop: "{{ minecraft }}"
 
-- name: Install Java 11
+- name: "Install default Java, version {{ minecraft_java }}"
   apt:
-    name: openjdk-11-jre
+    name: "{{ minecraft_java_pkg }}"
     state: present
-  when: item.java.version is not defined or item.java.version == 11
+  when: item.java.version is not defined
   loop: "{{ minecraft }}"
+  register: minecraft_java_default
 
-- name: Activate Java 8
+- name: "Activate default Java, version {{ minecraft_java }}"
   alternatives:
     name: java
-    path: /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre/bin/java
-  when: minecraft_java == 8
-
-- name: Activate Java 11
-  alternatives:
-    name: java
-    path: /usr/lib/jvm/java-11-openjdk-amd64/bin/java
-  when: minecraft_java == 11
+    path: "/usr/lib/jvm/{{ minecraft_java_pkg }}-amd64/bin/java"
+  when: minecraft_java_default.changed
diff --git a/roles/minecraft/templates/environment.conf.j2 b/roles/minecraft/templates/environment.conf.j2
index f06611d..4e837b7 100644
--- a/roles/minecraft/templates/environment.conf.j2
+++ b/roles/minecraft/templates/environment.conf.j2
@@ -1,8 +1,7 @@
-{% if item.java.version is defined and item.java.version == 8 %}
-JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre
+{% if item.java.version is defined %}
+JAVA_HOME=/usr/lib/jvm/adoptopenjdk-{{ item.java.version }}-hotspot-amd64
 {% else %}
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+JAVA_HOME=/usr/lib/jvm/{{ minecraft_java_pkg }}-amd64
 {% endif %}
 JAVA_XMS={{ item.java.Xms }}
 JAVA_XMX={{ item.java.Xmx }}
-