diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
index 3fdb390f1..b6730ca8e 100644
--- a/manifests/repo/apt.pp
+++ b/manifests/repo/apt.pp
@@ -29,10 +29,14 @@
     location     => $location,
     release      => $release,
     repos        => $repos,
-    include_src  => $include_src,
-    key          => $key,
-    key_source   => $key_source,
-    key_content  => $key_content,
+    include      => {
+      src => $include_src,
+    },
+    key          => {
+      id      => $key,
+      source  => $key_source,
+      content => $key_content,
+    },
     architecture => $architecture,
   }
 
diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb
index 7d256844b..ff93db482 100644
--- a/spec/classes/rabbitmq_spec.rb
+++ b/spec/classes/rabbitmq_spec.rb
@@ -1425,8 +1425,12 @@
           'location'    => 'http://www.rabbitmq.com/debian/',
           'release'     => 'testing',
           'repos'       => 'main',
-          'include_src' => false,
-          'key'         => '0A9AF2115F4687BD29803A206B73A36E6026DFCA'
+          'include'     => {
+              'src'     => false
+          },
+          'key'         => {
+              'id'      => '0A9AF2115F4687BD29803A206B73A36E6026DFCA'
+          }
         ) }
       end
     end
@@ -1439,8 +1443,12 @@
           'location'    => 'http://www.rabbitmq.com/debian/',
           'release'     => 'testing',
           'repos'       => 'main',
-          'include_src' => false,
-          'key'         => '0A9AF2115F4687BD29803A206B73A36E6026DFCA'
+          'include'     => {
+              'src'     => false
+          },
+          'key'         => {
+              'id'      => '0A9AF2115F4687BD29803A206B73A36E6026DFCA'
+          }
         ) }
 
         it { should contain_apt__pin('rabbitmq').with(