diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 0727b99ec..190318bea 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -546,14 +546,14 @@ augeas { 'lvm.conf':
 }
 
 if str2bool(hiera('enable_docker_registry', true)) {
-  group { 'docker':
-    ensure => 'present',
-  }
-  user { 'docker_user':
-    name   => hiera('tripleo_install_user'),
-    groups => 'docker',
-    notify => Service['docker'],
-  }
+  ensure_resource('group', 'docker', {
+    'ensure' => 'present',
+  })
+  ensure_resource('user', 'docker_user', {
+    'name'   => hiera('tripleo_install_user'),
+    'groups' => 'docker',
+    'notify' => Service['docker'],
+  })
   include ::tripleo::profile::base::docker_registry
 }