diff --git a/Rakefile b/Rakefile
index e386165..ae53316 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,15 @@
 # frozen_string_literal: true
 
-Dir.glob('tasks/*.rake').each { |r| import r }
+require 'rspec/core/rake_task'
+
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+Bundler::GemHelper.install_tasks
+
+RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
diff --git a/tasks/build.rake b/tasks/build.rake
deleted file mode 100644
index feec830..0000000
--- a/tasks/build.rake
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-lib = File.expand_path('../lib', __dir__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-require 'thumbor/version'
-
-desc 'Build gem last version'
-task :build do
-  system 'mkdir -p pkg/gems'
-  system 'gem build ruby-thumbor.gemspec'
-  system "mv ruby-thumbor-#{Thumbor::VERSION}.gem pkg/"
-end
-
-desc 'Build and gem upload'
-task release: :build do
-  system "gem push pkg/ruby-thumbor-#{Thumbor::VERSION}.gem"
-end
diff --git a/tasks/rspec.rake b/tasks/rspec.rake
deleted file mode 100644
index b263959..0000000
--- a/tasks/rspec.rake
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)