diff --git a/config/foreman.migrations/20210929144850_disable_puppet_plugins_if_undesired.rb b/config/foreman.migrations/20210929144850_disable_puppet_plugins_if_undesired.rb
new file mode 100644
index 000000000..618c39a9f
--- /dev/null
+++ b/config/foreman.migrations/20210929144850_disable_puppet_plugins_if_undesired.rb
@@ -0,0 +1,10 @@
+# This fixes up 20210803130619_add_hammer_puppet_plugin.rb in case foreman::cli
+# is disabled
+if answers['foreman::cli::puppet'] && !answers['foreman::cli']
+  answers['foreman::cli::puppet'] = false
+end
+# This fixes up 20210708144320_add_foreman_puppet.rb in case foreman is
+# disabled
+if answers['foreman::plugin::puppet'] && !answers['foreman']
+  answers['foreman::plugin::puppet'] = false
+end
diff --git a/config/katello.migrations/170331152302-add-cli.rb b/config/katello.migrations/170331152302-add-cli.rb
index 1ab36cd4c..589bc158e 100644
--- a/config/katello.migrations/170331152302-add-cli.rb
+++ b/config/katello.migrations/170331152302-add-cli.rb
@@ -1 +1,3 @@
-answers['foreman::cli'] ||= true
+unless answers.key?('foreman::cli')
+  answers['foreman::cli'] = true
+end
diff --git a/config/katello.migrations/210929144850-disable-puppet-plugins-if-undesired.rb b/config/katello.migrations/210929144850-disable-puppet-plugins-if-undesired.rb
new file mode 100644
index 000000000..f4124182e
--- /dev/null
+++ b/config/katello.migrations/210929144850-disable-puppet-plugins-if-undesired.rb
@@ -0,0 +1,10 @@
+# This fixes up 20210803130619-add-hammer-puppet-plugin.rb in case foreman::cli
+# is disabled
+if answers['foreman::cli::puppet'] && !answers['foreman::cli']
+  answers['foreman::cli::puppet'] = false
+end
+# This fixes up 210708144422-add-foreman-puppet.rb in case foreman is
+# disabled
+if answers['foreman::plugin::puppet'] && !answers['foreman']
+  answers['foreman::plugin::puppet'] = false
+end
diff --git a/spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml b/spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml
index e711bd128..d151d40d2 100644
--- a/spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml
+++ b/spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml
@@ -21,7 +21,7 @@ foreman::plugin::kubevirt: false
 foreman::plugin::leapp: false
 foreman::plugin::memcache: false
 foreman::plugin::monitoring: false
-foreman::plugin::puppet: true
+foreman::plugin::puppet: false
 foreman::plugin::remote_execution: true
 foreman::plugin::remote_execution::cockpit: false
 foreman::plugin::rh_cloud: false
diff --git a/spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml b/spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml
index 38155ee72..c2a8877c4 100644
--- a/spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml
+++ b/spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml
@@ -21,7 +21,7 @@ foreman::plugin::kubevirt: false
 foreman::plugin::leapp: false
 foreman::plugin::memcache: false
 foreman::plugin::monitoring: false
-foreman::plugin::puppet: true
+foreman::plugin::puppet: false
 foreman::plugin::remote_execution: true
 foreman::plugin::remote_execution::cockpit: false
 foreman::plugin::rh_cloud: false
diff --git a/spec/fixtures/pulpcore-migration/katello-answers-after.yaml b/spec/fixtures/pulpcore-migration/katello-answers-after.yaml
index 7a9a4b222..6cfd0c40b 100644
--- a/spec/fixtures/pulpcore-migration/katello-answers-after.yaml
+++ b/spec/fixtures/pulpcore-migration/katello-answers-after.yaml
@@ -21,7 +21,7 @@ foreman::plugin::kubevirt: false
 foreman::plugin::leapp: false
 foreman::plugin::memcache: false
 foreman::plugin::monitoring: false
-foreman::plugin::puppet: true
+foreman::plugin::puppet: false
 foreman::plugin::remote_execution: true
 foreman::plugin::remote_execution::cockpit: false
 foreman::plugin::rh_cloud: false
diff --git a/spec/migration_spec.rb b/spec/migration_spec.rb
index ac42b68f1..b63a23c91 100644
--- a/spec/migration_spec.rb
+++ b/spec/migration_spec.rb
@@ -142,4 +142,38 @@
       end
     end
   end
+
+  context 'disable puppet if needed' do
+    %w[foreman katello].each do |scenario_name|
+      context "on #{scenario_name}" do
+        let(:answers) do
+          {
+            'foreman' => false,
+            'foreman::cli' => false,
+          }
+        end
+        let(:scenario_name) { scenario_name }
+        let(:config) { load_config_yaml("#{scenario_name}.yaml") }
+        let(:migrations) { config_path("#{scenario_name}.migrations") }
+        let(:migrator) { Kafo::Migrations.new(migrations).run(config, answers) }
+        subject(:migrated_answers) { migrator[1] }
+
+        it 'keeps foreman::cli disabled' do
+          expect(migrated_answers['foreman::cli']).to be false
+        end
+
+        it 'adds foreman::cli::puppet disabled' do
+          expect(migrated_answers['foreman::cli::puppet']).to be false
+        end
+
+        it 'keeps foreman disabled' do
+          expect(migrated_answers['foreman']).to be false
+        end
+
+        it 'adds foreman::plugin::puppet disabled' do
+          expect(migrated_answers['foreman::plugin::puppet']).to be false
+        end
+      end
+    end
+  end
 end