diff --git a/foreman_remote_execution.gemspec b/foreman_remote_execution.gemspec
index c205285b1..23b9afd9c 100644
--- a/foreman_remote_execution.gemspec
+++ b/foreman_remote_execution.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'deface'
   s.add_dependency 'dynflow', '>= 1.0.2', '< 2.0.0'
-  s.add_dependency 'foreman-tasks', '>= 8.3.0'
 
   s.add_development_dependency 'factory_bot_rails', '~> 4.8.0'
   s.add_development_dependency 'rdoc'
diff --git a/gemfile.d/foreman_tasks.local.rb b/gemfile.d/foreman_tasks.local.rb
new file mode 100644
index 000000000..de8127696
--- /dev/null
+++ b/gemfile.d/foreman_tasks.local.rb
@@ -0,0 +1 @@
+gem 'foreman-tasks', github: 'ofedoren/foreman-tasks', branch: 'feat-37452-support-zeitwerk'