diff --git a/home/.chezmoiremove b/home/.chezmoiremove
index d04e3eb..8ebfd4d 100644
--- a/home/.chezmoiremove
+++ b/home/.chezmoiremove
@@ -37,6 +37,9 @@
 .antigen/
 .antigenrc
 
+# pkgx can be used instead
+.sdkman/
+
 # Remove font variants there used to be installed but no longer are
 .local/share/fonts/Fira Code * Nerd Font Complete*.ttf
 !.local/share/fonts/Fira Code Regular Nerd Font Complete Mono.ttf
diff --git a/home/.chezmoiscripts/run_after_30-install-pkgx-packages.sh.tmpl b/home/.chezmoiscripts/run_after_30-install-pkgx-packages.sh.tmpl
index 2c39b97..a2e33fe 100644
--- a/home/.chezmoiscripts/run_after_30-install-pkgx-packages.sh.tmpl
+++ b/home/.chezmoiscripts/run_after_30-install-pkgx-packages.sh.tmpl
@@ -29,6 +29,8 @@ done
 
 readonly wanted_packages=(
   opendev.org/git-review
+  openjdk.org
+  maven.apache.org
 )
 
 missing_packages=()
diff --git a/home/.chezmoiscripts/run_after_32-install-sdkman-packages.sh.tmpl b/home/.chezmoiscripts/run_after_32-install-sdkman-packages.sh.tmpl
deleted file mode 100644
index 289e7af..0000000
--- a/home/.chezmoiscripts/run_after_32-install-sdkman-packages.sh.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# {{ template "scripts-library" }}
-# {{ template "sdkman-library" }}
-
-# The following line is for ShellCheck to correctly identify the above include
-true || source ../.chezmoitemplates/scripts-library
-true || source ../.chezmoitemplates/sdkman-library
-
-if ! sdk version &>/dev/null; then
-  log_task "Installing SDKMAN!"
-
-  # chezmoi already created the sdkman dir because of the etc/config file, so we move it temporarily out
-
-  original_sdkman_config="${SDKMAN_DIR}/etc/config"
-  temp_sdkman_config="$(mktemp --dry-run --suffix=sdkman_config)"
-
-  mv -f "${original_sdkman_config}" "${temp_sdkman_config}"
-  rm -rf "${SDKMAN_DIR}"
-
-  sdkman_install_script=$(curl -fsSL "https://get.sdkman.io/?rcupdate=false")
-  bash -c "${sdkman_install_script}"
-
-  mv -f "${temp_sdkman_config}" "${original_sdkman_config}"
-fi
-
-java_version="11"
-identifier="$(sdk list java | grep --only-matching --max-count 1 --extended-regexp "\b${java_version}.[0-9]+.[0-9]+(.[0-9]+)?-tem\b")"
-if ! sdk current java | grep -q "${identifier}"; then
-  log_task "Installing Java ${java_version} with SDKMAN!"
-  c sdk install java "${identifier}"
-  c sdk default java "${identifier}"
-fi
diff --git a/home/.chezmoitemplates/sdkman-library b/home/.chezmoitemplates/sdkman-library
deleted file mode 100644
index b3489f3..0000000
--- a/home/.chezmoitemplates/sdkman-library
+++ /dev/null
@@ -1,22 +0,0 @@
-# shellcheck shell=bash
-
-export SDKMAN_DIR="${HOME}/.sdkman"
-
-function sdk() {
-  if [[ -f "${SDKMAN_DIR}/bin/sdkman-init.sh" ]]; then
-    bash <(
-      # shellcheck disable=SC2312
-      cat <<'EOM'
-export PAGER=cat
-
-source "${SDKMAN_DIR}/bin/sdkman-init.sh"
-
-# yes is needed because sdkman keeps waiting for input sometimes
-yes | sdk "$@"
-EOM
-    ) "$@"
-  else
-    log_error "SDKMAN! is not installed"
-    return 127
-  fi
-}
diff --git a/home/dot_local/bin/executable_full-upgrade.tmpl b/home/dot_local/bin/executable_full-upgrade.tmpl
index 847e161..8a0b91e 100644
--- a/home/dot_local/bin/executable_full-upgrade.tmpl
+++ b/home/dot_local/bin/executable_full-upgrade.tmpl
@@ -3,13 +3,11 @@
 # {{ template "scripts-library" }}
 # {{ template "homebrew-library" }}
 # {{ template "volta-library" }}
-# {{ template "sdkman-library" }}
 
 # The following line is for ShellCheck to correctly identify the above include
 true || source ../../.chezmoitemplates/scripts-library
 true || source ../../.chezmoitemplates/homebrew-library
 true || source ../../.chezmoitemplates/volta-library
-true || source ../../.chezmoitemplates/sdkman-library
 
 ensure_path_entry "${HOME}/.local/bin"
 
@@ -151,15 +149,6 @@ if npm --version &>/dev/null; then
   c npm update --global
 fi
 
-# shellcheck disable=SC2310
-if sdk version &>/dev/null; then
-  log_task "Updating sdk"
-  c sdk selfupdate
-
-  log_task "Updating sdk packages"
-  c sdk update
-fi
-
 if timeout 2 wsl.exe --version &>/dev/null; then
   log_task "Updating VS Code"
   # WinGet returns non zero code if no upgrade is found, so for now we simply ignore it.
diff --git a/home/dot_sdkman/etc/config b/home/dot_sdkman/etc/config
deleted file mode 100644
index 2dff894..0000000
--- a/home/dot_sdkman/etc/config
+++ /dev/null
@@ -1,18 +0,0 @@
-# make sdkman non-interactive, preferred for CI environments
-sdkman_auto_answer=true
-
-# check for newer versions and prompt for update
-sdkman_selfupdate_feature=true
-sdkman_auto_update=false
-
-# other default settings
-sdkman_auto_complete=true
-sdkman_auto_env=false
-sdkman_beta_channel=false
-sdkman_checksum_enable=true
-sdkman_colour_enable=true
-sdkman_curl_connect_timeout=7
-sdkman_curl_max_time=10
-sdkman_debug_mode=false
-sdkman_insecure_ssl=false
-sdkman_rosetta2_compatible=false
diff --git a/home/dot_zshrc b/home/dot_zshrc
index 04ad1b9..4240400 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -1,6 +1,6 @@
 # Load .profile
 if [[ -r "${HOME}/.profile" ]]; then
-  # Do not use emulate here, as SDKMAN! will produce errors otherwise
+  # Do not use emulate here, as pkgx errors with unsupported shell
   source "${HOME}/.profile"
 fi