diff --git a/Gemfile b/Gemfile
index fbd79bba867..3147e604127 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,3 +5,5 @@ gemspec
 Dir[File.join(__dir__, 'gemfile.d', '*.rb')].each do |bundle|
   eval_gemfile(bundle)
 end
+
+gem 'dynflow', git: 'https://github.com/adamruzicka/dynflow', branch: 'kwargs-extravaganza'
diff --git a/katello.gemspec b/katello.gemspec
index 5b23fc1f33f..e0da70ccb34 100644
--- a/katello.gemspec
+++ b/katello.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rabl"
   gem.add_dependency "foreman-tasks", ">= 5.0"
   gem.add_dependency "foreman_remote_execution", ">= 7.1.0"
-  gem.add_dependency "dynflow", ">= 1.6.1"
+  # gem.add_dependency "dynflow", ">= 1.6.1"
   gem.add_dependency "activerecord-import"
   gem.add_dependency "stomp"
   gem.add_dependency "scoped_search", ">= 4.1.9"