diff --git a/packages/jdk.rb b/packages/jdk.rb
index 10ec160f4..ec84a4c47 100644
--- a/packages/jdk.rb
+++ b/packages/jdk.rb
@@ -3,7 +3,7 @@ require 'package'
 class Jdk < Package
   description 'The JDK is a development environment for building applications, applets, and components using the Java programming language.'
   homepage 'https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html'
-  version '8u331-18.0.1'
+  version '8u333-18.0.1.1'
   license 'Oracle-BCLA-JavaSE'
   compatibility 'all'
 
@@ -19,19 +19,17 @@ class Jdk < Package
     end
     puts
     puts "Select version:"
-    puts " 8 = JDK 8u331"
+    puts " 8 = JDK 8u333"
     if ARCH == 'x86_64'
-      puts "11 = JDK 11.0.15"
-      puts "15 = JDK 15.0.2"
-      puts "16 = JDK 16.0.2"
-      puts "17 = JDK 17.0.3"
-      puts "18 = JDK 18.0.1"
+      puts "11 = JDK 11.0.15.1"
+      puts "17 = JDK 17.0.3.1"
+      puts "18 = JDK 18.0.1.1"
     end
     puts " 0 = Cancel"
 
     while version = STDIN.gets.chomp
       case version
-      when '8', '11', '15', '16', '17', '18'
+      when '8', '11', '17', '18'
         depends_on 'jdk' + version
         break
       when '0'
diff --git a/packages/jdk11.rb b/packages/jdk11.rb
index 97e5fd5ae..2ffe9e325 100644
--- a/packages/jdk11.rb
+++ b/packages/jdk11.rb
@@ -3,40 +3,28 @@ require 'package'
 class Jdk11 < Package
   description 'The JDK is a development environment for building applications, applets, and components using the Java programming language.'
   homepage 'https://www.oracle.com/java/technologies/javase-jdk11-downloads.html'
-  version '11.0.15'
+  version '11.0.15.1'
   license 'Oracle-BCLA-JavaSE'
   compatibility 'x86_64'
   source_url 'SKIP'
 
-  binary_url ({
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk11/11.0.15_x86_64/jdk11-11.0.15-chromeos-x86_64.tar.zst',
-  })
-  binary_sha256 ({
-     x86_64: 'afe982bf92cc93d9c9463f0229e5b4122fc2d8340c348404bb0255ef477b84b8',
-  })
-
+  no_compile_needed
   no_patchelf
 
   def self.preflight
-    abort "JDK8 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk8"
-    abort "JDK15 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk15"
-    abort "JDK16 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk16"
-    abort "JDK17 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk17"
-    abort "JDK18 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk18"
+    ['jdk8','jdk15','jdk16','jdk17','jdk18'].each do |jdk|
+      abort "#{jdk} installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/#{jdk}"
+    end
   end
 
   def self.install
     jdk_bin = "#{HOME}/Downloads/jdk-#{version}_linux-x64_bin.tar.gz"
-    jdk_sha256 = 'd69e577d6ea80bea71d01db1d17c1e764ad65982942991f4641bc63202a495ba'
+    jdk_sha256 = 'a40ad9342646ec14196deaf28c64f697fef4c698296f0e7d39b638f360780d27'
     unless File.exist? jdk_bin then
-      puts
-      puts "Oracle now requires an account to download the JDK.".orange
-      puts
+      puts "\nOracle now requires an account to download the JDK.\n".orange
       puts "You must login at https://login.oracle.com/mysso/signon.jsp and then visit:".orange
-      puts "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html".orange
-      puts
-      puts "Download the JDK for your architecture to #{HOME}/Downloads to continue.".orange
-      puts
+      puts "https://www.oracle.com/java/technologies/downloads/#java11".orange
+      puts "\nDownload the JDK for your architecture to #{HOME}/Downloads to continue.\n".orange
       abort
     end
     abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read(jdk_bin) ) == jdk_sha256
diff --git a/packages/jdk15.rb b/packages/jdk15.rb
deleted file mode 100644
index f52c8add6..000000000
--- a/packages/jdk15.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'package'
-
-class Jdk15 < Package
-  description 'The JDK is a development environment for building applications, applets, and components using the Java programming language.'
-  homepage 'https://www.oracle.com/java/technologies/javase-jdk15-downloads.html'
-  version '15.0.2'
-  license 'Oracle-BCLA-JavaSE'
-  compatibility 'x86_64'
-  source_url 'SKIP'
-
-  binary_url ({
-    x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk15/15.0.2_x86_64/jdk15-15.0.2-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    x86_64: '76967a212cb4bded9932fa2e44328272472f780a69e1574da9f4412a81de41ae',
-  })
-
-  def self.preflight
-    abort "JDK8 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk8"
-    abort "JDK11 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk11"
-    abort "JDK16 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk16"
-    abort "JDK17 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk17"
-    abort "JDK18 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk18"
-  end
-
-  def self.install
-    jdk_bin = "#{HOME}/Downloads/jdk-#{version}_linux-x64_bin.tar.gz"
-    jdk_sha256 = '54b29a3756671fcb4b6116931e03e86645632ec39361bc16ad1aaa67332c7c61'
-    unless File.exist? jdk_bin then
-      puts
-      puts "Oracle now requires an account to download the JDK.".orange
-      puts
-      puts "You must login at https://login.oracle.com/mysso/signon.jsp and then visit:".orange
-      puts "https://www.oracle.com/java/technologies/javase-jdk15-downloads.html".orange
-      puts
-      puts "Download the JDK for your architecture to #{HOME}/Downloads to continue.".orange
-      puts
-      abort
-    end
-    abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read(jdk_bin) ) == jdk_sha256
-    system "tar xvf #{jdk_bin}"
-    jdk15_dir = "#{CREW_DEST_PREFIX}/share/jdk15"
-    FileUtils.mkdir_p "#{jdk15_dir}"
-    FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin"
-    FileUtils.mkdir_p "#{CREW_DEST_MAN_PREFIX}/man1"
-    FileUtils.cd "jdk-#{version}" do
-      FileUtils.rm_f 'lib/src.zip'
-      FileUtils.mv Dir['*'], "#{jdk15_dir}/"
-    end
-    Dir["#{jdk15_dir}/bin/*"].each do |filename|
-      binary = File.basename(filename)
-      FileUtils.ln_s "#{CREW_PREFIX}/share/jdk15/bin/#{binary}", "#{CREW_DEST_PREFIX}/bin/#{binary}"
-    end
-    FileUtils.rm ["#{jdk15_dir}/man/man1/kinit.1", "#{jdk15_dir}/man/man1/klist.1"] # conflicts with krb5 package
-    FileUtils.mv "#{jdk15_dir}/man/", "#{CREW_DEST_PREFIX}/share/"
-  end
-end
diff --git a/packages/jdk16.rb b/packages/jdk16.rb
deleted file mode 100644
index cb20b2f2e..000000000
--- a/packages/jdk16.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'package'
-
-class Jdk16 < Package
-  description 'The JDK is a development environment for building applications, applets, and components using the Java programming language.'
-  homepage 'https://www.oracle.com/java/technologies/javase-jdk16-downloads.html'
-  version '16.0.2'
-  license 'Oracle-BCLA-JavaSE'
-  compatibility 'x86_64'
-  source_url 'SKIP'
-
-  binary_url ({
-    x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk16/16.0.2_x86_64/jdk16-16.0.2-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    x86_64: '7acd295a21ee61486b1ef0baef3eaee1978d296d10cf1f767a0266fabb5c74f5',
-  })
-
-  def self.preflight
-    abort "JDK8 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk8"
-    abort "JDK11 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk11"
-    abort "JDK15 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk15"
-    abort "JDK17 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk17"
-    abort "JDK18 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk18"
-  end
-
-  def self.install
-    jdk_bin = "#{HOME}/Downloads/jdk-#{version}_linux-x64_bin.tar.gz"
-    jdk_sha256 = '630e3e56c58f45db3788343ce842756d5a5a401a63884242cc6a141071285a62'
-    unless File.exist? jdk_bin then
-      puts
-      puts "Oracle now requires an account to download the JDK.".orange
-      puts
-      puts "You must login at https://login.oracle.com/mysso/signon.jsp and then visit:".orange
-      puts "https://www.oracle.com/java/technologies/javase-jdk16-downloads.html".orange
-      puts
-      puts "Download the JDK for your architecture to #{HOME}/Downloads to continue.".orange
-      puts
-      abort
-    end
-    abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read(jdk_bin) ) == jdk_sha256
-    system "tar xvf #{jdk_bin}"
-    jdk16_dir = "#{CREW_DEST_PREFIX}/share/jdk16"
-    FileUtils.mkdir_p "#{jdk16_dir}"
-    FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin"
-    FileUtils.mkdir_p "#{CREW_DEST_MAN_PREFIX}/man1"
-    FileUtils.cd "jdk-#{version}" do
-      FileUtils.rm_f 'lib/src.zip'
-      FileUtils.mv Dir['*'], "#{jdk16_dir}/"
-    end
-    Dir["#{jdk16_dir}/bin/*"].each do |filename|
-      binary = File.basename(filename)
-      FileUtils.ln_s "#{CREW_PREFIX}/share/jdk16/bin/#{binary}", "#{CREW_DEST_PREFIX}/bin/#{binary}"
-    end
-    FileUtils.rm ["#{jdk16_dir}/man/man1/kinit.1", "#{jdk16_dir}/man/man1/klist.1"] # conflicts with krb5 package
-    FileUtils.mv "#{jdk16_dir}/man/", "#{CREW_DEST_PREFIX}/share/"
-  end
-end
diff --git a/packages/jdk17.rb b/packages/jdk17.rb
index 8929fb9e7..7d2cc8aa5 100644
--- a/packages/jdk17.rb
+++ b/packages/jdk17.rb
@@ -3,40 +3,28 @@ require 'package'
 class Jdk17 < Package
   description 'The JDK is a development environment for building applications, applets, and components using the Java programming language.'
   homepage 'https://www.oracle.com/java/technologies/downloads/#java17'
-  version '17.0.3'
+  version '17.0.3.1'
   license 'Oracle-BCLA-JavaSE'
   compatibility 'x86_64'
   source_url 'SKIP'
 
-  binary_url ({
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk17/17.0.3_x86_64/jdk17-17.0.3-chromeos-x86_64.tar.zst',
-  })
-  binary_sha256 ({
-     x86_64: '650fc2e027e3625d93d8350f2dcff472dbbaa26e5886c1b98a1edf25360db946',
-  })
-
+  no_compile_needed
   no_patchelf
 
   def self.preflight
-    abort "JDK8 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk8"
-    abort "JDK11 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk11"
-    abort "JDK15 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk15"
-    abort "JDK16 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk16"
-    abort "JDK18 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk18"
+    ['jdk8','jdk11','jdk15','jdk16','jdk18'].each do |jdk|
+      abort "#{jdk} installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/#{jdk}"
+    end
   end
 
   def self.install
     jdk_bin = "#{HOME}/Downloads/jdk-17_linux-x64_bin.tar.gz"
-    jdk_sha256 = '67b390651dea7223b684a2003c4bd630f3ab915033c26c2237367c1da2fa91c5'
+    jdk_sha256 = '11b4465229b77fa84416a14b5e7023b6d2cf03cda5eb1557d57aea0247fff643'
     unless File.exist? jdk_bin then
-      puts
-      puts "Oracle now requires an account to download the JDK.".orange
-      puts
+      puts "\nOracle now requires an account to download the JDK.\n".orange
       puts "You must login at https://login.oracle.com/mysso/signon.jsp and then visit:".orange
       puts "https://www.oracle.com/java/technologies/downloads/#java17".orange
-      puts
-      puts "Download the JDK for your architecture to #{HOME}/Downloads to continue.".orange
-      puts
+      puts "\nDownload the JDK for your architecture to #{HOME}/Downloads to continue.\n".orange
       abort
     end
     abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read(jdk_bin) ) == jdk_sha256
diff --git a/packages/jdk18.rb b/packages/jdk18.rb
index 9b99dd349..f9264655c 100644
--- a/packages/jdk18.rb
+++ b/packages/jdk18.rb
@@ -3,40 +3,28 @@ require 'package'
 class Jdk18 < Package
   description 'The JDK is a development environment for building applications, applets, and components using the Java programming language.'
   homepage 'https://www.oracle.com/java/technologies/downloads/#java18'
-  version '18.0.1'
+  version '18.0.1.1'
   license 'Oracle-BCLA-JavaSE'
   compatibility 'x86_64'
   source_url 'SKIP'
 
-  binary_url ({
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk18/18.0.1_x86_64/jdk18-18.0.1-chromeos-x86_64.tar.zst',
-  })
-  binary_sha256 ({
-     x86_64: '96af8a414a2b175eed412a32ac6dd478cf17f1231de53ecff2f8a329e8a30ab7',
-  })
-
+  no_compile_needed
   no_patchelf
 
   def self.preflight
-    abort "JDK8 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk8"
-    abort "JDK11 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk11"
-    abort "JDK15 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk15"
-    abort "JDK16 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk16"
-    abort "JDK17 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk17"
+    ['jdk8','jdk11','jdk15','jdk16','jdk17'].each do |jdk|
+      abort "#{jdk} installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/#{jdk}"
+    end
   end
 
   def self.install
     jdk_bin = "#{HOME}/Downloads/jdk-18_linux-x64_bin.tar.gz"
-    jdk_sha256 = '15f017ea76d7bb9da2e4c25097d515f1a6181f7e857f86919721fe760a19ff56'
+    jdk_sha256 = 'dbabd3f726775a63329254b001b4190c082206e38323950b2db478606f1d65fa'
     unless File.exist? jdk_bin then
-      puts
-      puts "Oracle now requires an account to download the JDK.".orange
-      puts
+      puts "\nOracle now requires an account to download the JDK.\n".orange
       puts "You must login at https://login.oracle.com/mysso/signon.jsp and then visit:".orange
       puts "https://www.oracle.com/java/technologies/downloads/#java18".orange
-      puts
-      puts "Download the JDK for your architecture to #{HOME}/Downloads to continue.".orange
-      puts
+      puts "\nDownload the JDK for your architecture to #{HOME}/Downloads to continue.\n".orange
       abort
     end
     abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read(jdk_bin) ) == jdk_sha256
diff --git a/packages/jdk8.rb b/packages/jdk8.rb
index 8d7130684..073f4f28d 100644
--- a/packages/jdk8.rb
+++ b/packages/jdk8.rb
@@ -3,55 +3,37 @@ require 'package'
 class Jdk8 < Package
   description 'The JDK is a development environment for building applications, applets, and components using the Java programming language.'
   homepage 'https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html'
-  version '8u331'
+  version '8u333'
   license 'Oracle-BCLA-JavaSE'
   compatibility 'all'
   source_url 'SKIP'
 
-  binary_url ({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk8/8u331_armv7l/jdk8-8u331-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk8/8u331_armv7l/jdk8-8u331-chromeos-armv7l.tar.zst',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk8/8u331_i686/jdk8-8u331-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk8/8u331_x86_64/jdk8-8u331-chromeos-x86_64.tar.zst',
-  })
-  binary_sha256 ({
-    aarch64: '1793fe2d3e4b8e0ebaefb8a3ea70c74e0c2ea60685c35658f5aa543487076d0d',
-     armv7l: '1793fe2d3e4b8e0ebaefb8a3ea70c74e0c2ea60685c35658f5aa543487076d0d',
-       i686: '6202cf6bd725a694af3ce170db4b03c97b7cb0d090f4304abbd639b9425cdbc9',
-     x86_64: 'e2afb6dcbbe6ae7154e2cd1c112dbbf6055fa4b6063daf560a597064b8511b5d',
-  })
-
+  no_compile_needed
   no_patchelf
 
   def self.preflight
-    abort "JDK11 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk11"
-    abort "JDK15 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk15"
-    abort "JDK16 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk16"
-    abort "JDK17 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk17"
-    abort "JDK18 installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/jdk18"
+    ['jdk11','jdk15','jdk16','jdk17','jdk18'].each do |jdk|
+      abort "#{jdk} installed.".lightgreen if Dir.exist? "#{CREW_PREFIX}/share/#{jdk}"
+    end
   end
 
   def self.install
     case ARCH
     when 'aarch64', 'armv7l'
       jdk_bin = "#{HOME}/Downloads/jdk-#{version}-linux-arm32-vfp-hflt.tar.gz"
-      jdk_sha256 = '83bcb32b3f52e57aab425e22e35e28b49a81477a21bf184ed0ef1bc74f1a3e16'
+      jdk_sha256 = '8e42b06b7db1196d771561e1167444e29f13e8bf41adfda3e70e55c0476d900f'
     when 'i686'
       jdk_bin = "#{HOME}/Downloads/jdk-#{version}-linux-i586.tar.gz"
-      jdk_sha256 = '525ef1c399b3a7f7255f9e1e9a3d1044b56a40d4d2cae2775e819c1173b8ec5d'
+      jdk_sha256 = '9337ea438cf3aca880bfc9c1500fd15ce121cec1d601dd5f55baf1f7f475f0ce'
     when 'x86_64'
       jdk_bin = "#{HOME}/Downloads/jdk-#{version}-linux-x64.tar.gz"
-      jdk_sha256 = '272a4ceb76bf286b40eb07d581a8d134f6be5fb5f646cb25c2212b1e7779bb91'
+      jdk_sha256 = '5390619a722eaccabd3b496f462b7f87cf69f98d3662fdc8452562b7bcb17e09'
     end
     unless File.exist? jdk_bin
-      puts
-      puts "Oracle now requires an account to download the JDK.".orange
-      puts
+      puts "\nOracle now requires an account to download the JDK.\n".orange
       puts "You must login at https://login.oracle.com/mysso/signon.jsp and then visit:".orange
       puts "https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html".orange
-      puts
-      puts "Download the JDK for your architecture to #{HOME}/Downloads to continue.".orange
-      puts
+      puts "\nDownload the JDK for your architecture to #{HOME}/Downloads to continue.\n".orange
       abort
     end
     abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read(jdk_bin) ) == jdk_sha256