diff --git a/git/hooks/forward-merge b/git/hooks/forward-merge
index acbb6008..a042bb46 100755
--- a/git/hooks/forward-merge
+++ b/git/hooks/forward-merge
@@ -18,7 +18,14 @@ class ForwardMerge
 end
 
 def find_forward_merges(message_file)
+
   $log.debug "Searching for forward merge"
+  branch=`git rev-parse -q --abbrev-ref HEAD`.strip
+  $log.debug "Found #{branch} from git rev-parse --abbrev-ref"
+  if( branch == "docs-build") then
+    $log.debug "Skipping docs build"
+    return nil
+  end
   rev=`git rev-parse -q --verify MERGE_HEAD`.strip
   $log.debug "Found #{rev} from git rev-parse"
   return nil unless rev
@@ -65,7 +72,7 @@ def find_milestone(username, password, repository, title)
     prefix = title.delete_suffix('.x')
     $log.debug "Finding nearest milestone from candidates starting with #{prefix}"
     titles = milestones.map { |milestone| milestone['title'] }
-    titles = titles.select{ |title| title.start_with?(prefix) unless title.end_with?('.x')}
+    titles = titles.select{ |title| title.start_with?(prefix) unless title.end_with?('.x') || (title.count('.') > 2)}
     titles = titles.sort_by { |v| Gem::Version.new(v) }
     $log.debug "Considering candidates #{titles}"
     if(titles.empty?)
@@ -112,12 +119,16 @@ message_file=ARGV[0]
 forward_merges = find_forward_merges(message_file)
 exit 0 unless forward_merges
 
-$log.debug "Loading config from ~/.spring-restdocs/forward_merge.yml"
+$log.debug "Loading config from ~/.spring-restdocs/forward-merge.yml"
 config = YAML.load_file(File.join(Dir.home, '.spring-restdocs', 'forward-merge.yml'))
 username = config['github']['credentials']['username']
 password = config['github']['credentials']['password']
 dry_run = config['dry_run']
-repository = 'spring-projects/spring-restdocs'
+
+gradleProperties = IO.read('gradle.properties')
+springBuildType = gradleProperties.match(/^spring\.build-type\s?=\s?(.*)$/)
+repository = (springBuildType && springBuildType[1] != 'oss') ? "spring-projects/spring-restdocs-#{springBuildType[1]}" : "spring-projects/spring-restdocs";
+$log.debug "Targeting repository #{repository}"
 
 forward_merges.each do |forward_merge|
   existing_issue = get_issue(username, password, repository, forward_merge.issue)
diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge
index 2b049790..fbdb1e19 100755
--- a/git/hooks/prepare-forward-merge
+++ b/git/hooks/prepare-forward-merge
@@ -4,7 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'
 
-$main_branch = "3.0.x"
+$main_branch = "4.0.x"
 
 $log = Logger.new(STDOUT)
 $log.level = Logger::WARN