diff --git a/enju_ndl.gemspec b/enju_ndl.gemspec
index 998b8cf..5f38458 100644
--- a/enju_ndl.gemspec
+++ b/enju_ndl.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/solr/{data,pids,default,development,test}/*"] - Dir["spec/dummy/tmp/*"]
 
-  s.add_dependency "enju_biblio"
+  s.add_dependency "enju_subject", "~> 0.4.0.beta.1"
   s.add_dependency "lisbn"
   s.add_dependency "library_stdnums"
   s.add_dependency "faraday"
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
index cb979ec..fa2b62e 100644
--- a/gemfiles/rails_5.2.gemfile
+++ b/gemfiles/rails_5.2.gemfile
@@ -2,13 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "enju_seed", git: "https://github.com/next-l/enju_seed.git"
-gem "enju_leaf", git: "https://github.com/next-l/enju_leaf.git"
-gem "enju_biblio", git: "https://github.com/next-l/enju_biblio.git"
-gem "enju_library", git: "https://github.com/next-l/enju_library.git"
-gem "enju_subject", git: "https://github.com/next-l/enju_subject.git"
+gem "enju_leaf", branch: "2.x", git: "https://github.com/next-l/enju_leaf.git"
 gem "enju_question", git: "https://github.com/next-l/enju_question.git"
-gem "enju_manifestation_viewer", git: "https://github.com/next-l/enju_manifestation_viewer.git"
 gem "enju_bookmark", git: "https://github.com/next-l/enju_bookmark.git"
 gem "jquery-rails"
 gem "paper_trail"
diff --git a/gemfiles/rails_5.2_loc.gemfile b/gemfiles/rails_5.2_loc.gemfile
index a4bf252..d74b3c0 100644
--- a/gemfiles/rails_5.2_loc.gemfile
+++ b/gemfiles/rails_5.2_loc.gemfile
@@ -2,13 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "enju_seed", git: "https://github.com/next-l/enju_seed.git"
-gem "enju_leaf", git: "https://github.com/next-l/enju_leaf.git"
-gem "enju_biblio", git: "https://github.com/next-l/enju_biblio.git"
-gem "enju_library", git: "https://github.com/next-l/enju_library.git"
-gem "enju_subject", git: "https://github.com/next-l/enju_subject.git"
+gem "enju_leaf", branch: "2.x", git: "https://github.com/next-l/enju_leaf.git"
 gem "enju_question", git: "https://github.com/next-l/enju_question.git"
-gem "enju_manifestation_viewer", git: "https://github.com/next-l/enju_manifestation_viewer.git"
 gem "enju_bookmark", git: "https://github.com/next-l/enju_bookmark.git"
 gem "jquery-rails"
 gem "paper_trail"
diff --git a/gemfiles/rails_5.2_nii.gemfile b/gemfiles/rails_5.2_nii.gemfile
index 7c069af..117d49f 100644
--- a/gemfiles/rails_5.2_nii.gemfile
+++ b/gemfiles/rails_5.2_nii.gemfile
@@ -2,13 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "enju_seed", git: "https://github.com/next-l/enju_seed.git"
-gem "enju_leaf", git: "https://github.com/next-l/enju_leaf.git"
-gem "enju_biblio", git: "https://github.com/next-l/enju_biblio.git"
-gem "enju_library", git: "https://github.com/next-l/enju_library.git"
-gem "enju_subject", git: "https://github.com/next-l/enju_subject.git"
+gem "enju_leaf", branch: "2.x", git: "https://github.com/next-l/enju_leaf.git"
 gem "enju_question", git: "https://github.com/next-l/enju_question.git"
-gem "enju_manifestation_viewer", git: "https://github.com/next-l/enju_manifestation_viewer.git"
 gem "enju_bookmark", git: "https://github.com/next-l/enju_bookmark.git"
 gem "jquery-rails"
 gem "paper_trail"