diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90921c9f..93510bb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@
 This file is used to list changes made in each version of the Java cookbook.
 
 ## Unreleased
+### 4.9002.0 - Roblox internal
+
+- Based on proposed changes from <https://github.com/sous-chefs/java/pull/567/>
+- Switch homebrew tap to homebrew/cask-versions
+- Make Homebrew Tap name an attribute to allow for other options
+
+### 4.9001.0 - Roblox internal
+
+- Make Homebrew Cask name an attribute to allow for other options (ex: adoptopenjdk)
 
 ## 4.1.0 - 2019-05-08
 
diff --git a/attributes/default.rb b/attributes/default.rb
index 0e7045ac..60fa2ad8 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -47,6 +47,8 @@
   default['java']['windows']['returns'] = 0
 when 'mac_os_x'
   default['java']['install_flavor'] = 'homebrew'
+  default['java']['homebrew']['tap'] = 'homebrew/cask-versions'
+  default['java']['homebrew']['cask'] = 'java'
 else
   default['java']['install_flavor'] = 'openjdk'
 end
diff --git a/metadata.rb b/metadata.rb
index 95b3c896..10002bf5 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license           'Apache-2.0'
 description       'Recipes and resources for installing Java and managing certificates'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '4.1.0'
+version           '4.9002.0'
 
 supports 'debian'
 supports 'ubuntu'
diff --git a/recipes/homebrew.rb b/recipes/homebrew.rb
index 6b761df0..0e96cf86 100644
--- a/recipes/homebrew.rb
+++ b/recipes/homebrew.rb
@@ -2,7 +2,7 @@
 include_recipe 'homebrew::cask'
 include_recipe 'java::notify'
 
-homebrew_tap 'caskroom/versions'
-homebrew_cask "java#{node['java']['jdk_version']}" do
+homebrew_tap node['java']['homebrew']['tap']
+homebrew_cask "#{node['java']['homebrew']['cask']}#{node['java']['jdk_version']}" do
   notifies :write, 'log[jdk-version-changed]', :immediately
 end