diff --git a/.fixtures.yml b/.fixtures.yml
index 4fba1d3a..90b34d3c 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -14,8 +14,6 @@ fixtures:
     foreman_proxy: "https://github.com/theforeman/puppet-foreman_proxy.git"
     foreman:       "https://github.com/theforeman/puppet-foreman"
     katello:       "https://github.com/theforeman/puppet-katello"
-    puppet:        "https://github.com/theforeman/puppet-puppet"
-    puppetserver_foreman: "https://github.com/theforeman/puppet-puppetserver_foreman"
     tftp:          "https://github.com/theforeman/puppet-tftp"
     xinetd:        "https://github.com/puppetlabs/puppetlabs-xinetd"
     certs:         "https://github.com/theforeman/puppet-certs.git"
diff --git a/manifests/init.pp b/manifests/init.pp
index 05b8af09..5fd824e2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,8 +24,6 @@
 #
 # === Advanced parameters:
 #
-# $puppet::                                    Enable puppet
-#
 # $reverse_proxy::                             Add reverse proxy to the parent
 #
 # $reverse_proxy_port::                        Reverse proxy listening port
@@ -101,8 +99,6 @@
 class foreman_proxy_content (
   Boolean $pulpcore_mirror = false,
 
-  Boolean $puppet = false,
-
   Boolean $reverse_proxy = false,
   Stdlib::Port $reverse_proxy_port = 8443,
 
@@ -397,17 +393,4 @@
     Pulpcore::Plugin <| |> ~> Foreman_smartproxy[$foreman_proxy::registered_name]
   }
   # lint:endignore
-
-  if $puppet {
-    # We can't pull the certs out to the top level, because of how it gets the default
-    # parameter values from the main certs class.  Kafo can't handle that case, so
-    # it remains here for now.
-    include puppet
-    if $puppet::server and $puppet::server::foreman {
-      class { 'certs::puppet':
-        hostname => $certs::foreman_proxy::hostname,
-        before   => Class['puppet::server::config'],
-      }
-    }
-  }
 }
diff --git a/spec/classes/foreman_proxy_content_spec.rb b/spec/classes/foreman_proxy_content_spec.rb
index 9f888d5d..1512eaa8 100644
--- a/spec/classes/foreman_proxy_content_spec.rb
+++ b/spec/classes/foreman_proxy_content_spec.rb
@@ -219,36 +219,6 @@
         end
       end
 
-      context 'with puppet' do
-        let(:params) do
-          {
-            puppet: true,
-          }
-        end
-
-        describe 'with puppet server enabled' do
-          let(:pre_condition) do
-            <<-PUPPET
-            class { 'puppet':
-              server         => true,
-              server_foreman => true,
-            }
-            PUPPET
-          end
-
-          it { is_expected.to compile.with_all_deps }
-          it do
-            is_expected.to contain_class('certs::puppet')
-              .that_comes_before(['Class[puppet::server::config]', 'Class[puppetserver_foreman]'])
-          end
-        end
-
-        describe 'with puppet server disabled' do
-          it { is_expected.to compile.with_all_deps }
-          it { is_expected.not_to contain_class('certs::puppet') }
-        end
-      end
-
       context 'with registration_url' do
         let(:params) do
           {