diff --git a/data/common.yaml b/data/common.yaml
index c25d117d6..20bd99ee7 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -31,7 +31,6 @@ rabbitmq::repo_gpg_key: ~
 rabbitmq::package_name: 'rabbitmq'
 rabbitmq::package_source: ~
 rabbitmq::package_provider: ~
-rabbitmq::repos_ensure: false
 rabbitmq::manage_python: true
 rabbitmq::python_package: 'python'
 rabbitmq::rabbitmq_user: 'rabbitmq'
diff --git a/examples/full.pp b/examples/full.pp
index 9e28ed7ca..65a9b3a60 100644
--- a/examples/full.pp
+++ b/examples/full.pp
@@ -1,6 +1,5 @@
 class { 'rabbitmq':
   delete_guest_user => true,
-  repos_ensure      => true,
   package_apt_pin   => 900,
 }
 
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 1e6b7459d..147775a42 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -15,7 +15,7 @@
   context 'default class inclusion' do
     let(:pp) do
       <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang': } ->
       class { 'rabbitmq': }
       EOS
     end
@@ -48,7 +48,7 @@ class { 'rabbitmq': }
   context 'disable and stop service' do
     let(:pp) do
       <<-EOS
-        class { 'erlang': repo_source => 'packagecloud' } ->
+        class { 'erlang': } ->
         class { 'rabbitmq':
           service_ensure => 'stopped',
         }
@@ -66,12 +66,12 @@ class { 'rabbitmq':
   context 'service is unmanaged' do
     it 'runs successfully' do
       pp_pre = <<-EOS
-        class { 'erlang': repo_source => 'packagecloud' } ->
+        class { 'erlang': } ->
         class { 'rabbitmq': }
       EOS
 
       pp = <<-EOS
-        class { 'erlang': repo_source => 'packagecloud' } ->
+        class { 'erlang': } ->
         class { 'rabbitmq':
           service_manage => false,
           service_ensure  => 'stopped',
diff --git a/spec/acceptance/clustering_spec.rb b/spec/acceptance/clustering_spec.rb
index 69b2e45db..16e16f76e 100644
--- a/spec/acceptance/clustering_spec.rb
+++ b/spec/acceptance/clustering_spec.rb
@@ -6,7 +6,7 @@
   context 'rabbitmq::wipe_db_on_cookie_change => false' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         cluster                  => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
         config_cluster           => true,
@@ -28,7 +28,7 @@ class { 'rabbitmq':
   context 'rabbitmq::wipe_db_on_cookie_change => true' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         cluster                  => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
         config_cluster           => true,
@@ -70,7 +70,7 @@ class { 'rabbitmq':
   context 'rabbitmq::cluster[:local_node] = foobar' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         cluster                  => { 'name' => 'rabbit_cluster', 'init_node' => 'foobar', 'local_node' => 'foobar' },
         config_cluster           => true,
diff --git a/spec/acceptance/delete_guest_user_spec.rb b/spec/acceptance/delete_guest_user_spec.rb
index 6236e12e3..2d5005a5b 100644
--- a/spec/acceptance/delete_guest_user_spec.rb
+++ b/spec/acceptance/delete_guest_user_spec.rb
@@ -6,7 +6,7 @@
   context 'delete_guest_user' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         port              => 5672,
         delete_guest_user => true,
diff --git a/spec/acceptance/parameter_spec.rb b/spec/acceptance/parameter_spec.rb
index e217319d5..8e4a6a5a1 100644
--- a/spec/acceptance/parameter_spec.rb
+++ b/spec/acceptance/parameter_spec.rb
@@ -6,7 +6,7 @@
   context 'create parameter resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
diff --git a/spec/acceptance/policy_spec.rb b/spec/acceptance/policy_spec.rb
index 2cf89c5fb..5edcab199 100644
--- a/spec/acceptance/policy_spec.rb
+++ b/spec/acceptance/policy_spec.rb
@@ -6,7 +6,7 @@
   context 'create policy resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
diff --git a/spec/acceptance/queue_spec.rb b/spec/acceptance/queue_spec.rb
index 1fd3217d3..266520cdc 100644
--- a/spec/acceptance/queue_spec.rb
+++ b/spec/acceptance/queue_spec.rb
@@ -6,7 +6,7 @@
   context 'create binding and queue resources when using default management port' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
@@ -77,7 +77,7 @@ class { 'rabbitmq':
   context 'create multiple bindings when same source / destination / vhost but different routing keys' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
@@ -162,7 +162,7 @@ class { 'rabbitmq':
   context 'create binding and queue resources when using a non-default management port' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
diff --git a/spec/acceptance/rabbitmqadmin_spec.rb b/spec/acceptance/rabbitmqadmin_spec.rb
index 557405a2b..bb72ecea0 100644
--- a/spec/acceptance/rabbitmqadmin_spec.rb
+++ b/spec/acceptance/rabbitmqadmin_spec.rb
@@ -6,7 +6,7 @@
   context 'downloads the cli tools' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         admin_enable   => true,
         service_manage => true,
@@ -24,7 +24,7 @@ class { 'rabbitmq':
   context 'does nothing if service is unmanaged' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         admin_enable   => true,
         service_manage => false,
@@ -44,7 +44,7 @@ class { 'rabbitmq':
     it 'runs successfully' do
       # make sure credential change takes effect before admin_enable
       pp_pre = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage => true,
         default_user   => 'foobar',
@@ -53,7 +53,7 @@ class { 'rabbitmq':
       EOS
 
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         admin_enable   => true,
         service_manage => true,
diff --git a/spec/acceptance/user_spec.rb b/spec/acceptance/user_spec.rb
index 48b8e7799..e81193d55 100644
--- a/spec/acceptance/user_spec.rb
+++ b/spec/acceptance/user_spec.rb
@@ -6,7 +6,7 @@
   context 'create user resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index fbb4867a3..563706d5f 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -6,7 +6,7 @@
   context 'create vhost resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb
index 56d189752..4e7a07453 100644
--- a/spec/classes/rabbitmq_spec.rb
+++ b/spec/classes/rabbitmq_spec.rb
@@ -234,7 +234,8 @@
             is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
           end
 
-          it { is_expected.to contain_package('python') } if %w[RedHat Debian SUSE Archlinux].include?(os_facts[:os]['family'])
+          it { is_expected.to contain_package('python') } if %w[Debian SUSE Archlinux].include?(os_facts[:os]['family'])
+          it { is_expected.to contain_package('python3') } if %w[RedHat].include?(os_facts[:os]['family'])
           it { is_expected.to contain_package('python38') } if %w[FreeBSD].include?(os_facts[:os]['family'])
         end
 
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 041367d7f..33062d664 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -3,11 +3,9 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker do |host|
-  install_module_from_forge_on(host, 'puppet-erlang', '>= 1.0.0 < 2.0.0')
+  install_module_from_forge_on(host, 'puppet-erlang', '>= 1.1.0 < 2.0.0')
 
   case fact_on(host, 'os.family')
-  when 'Debian'
-    install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 9.0.0')
   when 'RedHat'
     if fact_on(host, 'os.selinux.enabled')
       # Make sure selinux is disabled so the tests work.