diff --git a/.gem_release.yml b/.gem_release.yml
deleted file mode 100644
index 5116ee46ded..00000000000
--- a/.gem_release.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-bump:
-  recurse: false
-  file: 'core/lib/spree/core/version.rb'
-  message: Bump Solidus to %{version}
-
-release:
-  recurse: true
diff --git a/Gemfile b/Gemfile
index 5d244a2bbb2..76509befc73 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,7 +59,6 @@ group :utils do
   gem 'rubocop', '~> 1', require: false
   gem 'rubocop-performance', '~> 1.4', require: false
   gem 'rubocop-rails', '~> 2.9', require: false
-  gem 'gem-release', require: false
 end
 
 gem 'rspec_junit_formatter', require: false, group: :ci
diff --git a/Rakefile b/Rakefile
index c3b13a0c841..dd1cd7bf248 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler'
+require 'bundler/gem_tasks'
 
 task default: :spec
 
@@ -53,55 +54,21 @@ task :clean do
 end
 
 SOLIDUS_GEM_NAMES = %w[core api backend sample]
+GEM_TASKS_NAME = %w[build install]
 
-namespace :gem do
-  def version
-    require_relative 'core/lib/spree/core/version'
-    Spree.solidus_version
-  end
-
-  def for_each_gem
+GEM_TASKS_NAME.each do |task_name|
+  desc "Run rake gem:#{task} for each Solidus gem"
+  task task_name do
     SOLIDUS_GEM_NAMES.each do |gem_name|
-      print_title(gem_name)
-      yield "pkg/solidus_#{gem_name}-#{version}.gem"
+      cd(gem_name) { sh "rake #{task_name}" }
     end
-    print_title
-    yield "pkg/solidus-#{version}.gem"
   end
+end
 
-  desc "Build all solidus gems"
-  task :build do
-    pkgdir = File.expand_path('pkg', __dir__)
-    FileUtils.mkdir_p pkgdir
-
-    SOLIDUS_GEM_NAMES.each do |gem_name|
-      Dir.chdir(gem_name) do
-        sh "gem build solidus_#{gem_name}.gemspec"
-        mv "solidus_#{gem_name}-#{version}.gem", pkgdir
-      end
-    end
-
-    print_title
-    sh "gem build solidus.gemspec"
-    mv "solidus-#{version}.gem", pkgdir
-  end
-
-  desc "Install all solidus gems"
-  task install: :build do
-    for_each_gem do |gem_path|
-      Bundler.with_clean_env do
-        sh "gem install #{gem_path}"
-      end
-    end
-  end
-
-  desc "Release all gems to rubygems"
-  task release: :build do
-    sh "git tag -a -m \"Version #{version}\" v#{version}"
-
-    for_each_gem do |gem_path|
-      sh "gem push '#{gem_path}'"
-    end
+task :releasez do
+  require_relative 'core/lib/spree/core/version'
+  SOLIDUS_GEM_NAMES.each do |gem_name|
+    sh "gem push #{gem_name}/pkg/solidus_#{gem_name}-#{Spree.solidus_version}.gem"
   end
 end
 
diff --git a/api/Rakefile b/api/Rakefile
index 8d65355b382..5eafefdd818 100644
--- a/api/Rakefile
+++ b/api/Rakefile
@@ -5,6 +5,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 require 'spree/testing_support/dummy_app/rake_tasks'
+require 'bundler/gem_tasks'
 
 RSpec::Core::RakeTask.new
 task default: :spec
diff --git a/backend/Rakefile b/backend/Rakefile
index e81acac764f..54eddff77b2 100644
--- a/backend/Rakefile
+++ b/backend/Rakefile
@@ -4,6 +4,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
 
 require 'solidus_backend'
 require 'spree/testing_support/dummy_app/rake_tasks'
diff --git a/core/Rakefile b/core/Rakefile
index 65434a4670b..65b6bf05c7b 100644
--- a/core/Rakefile
+++ b/core/Rakefile
@@ -5,6 +5,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 require 'spree/testing_support/dummy_app/rake_tasks'
+require 'bundler/gem_tasks'
 
 RSpec::Core::RakeTask.new
 task default: :spec
diff --git a/sample/Rakefile b/sample/Rakefile
index de23db05f96..c392cfd6396 100644
--- a/sample/Rakefile
+++ b/sample/Rakefile
@@ -4,6 +4,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 require 'spree/testing_support/dummy_app/rake_tasks'
+require 'bundler/gem_tasks'
 
 RSpec::Core::RakeTask.new
 task default: :spec