diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml
index 6c55951c96..b3c9be1703 100644
--- a/ci/environments/scenario004-standalone.yaml
+++ b/ci/environments/scenario004-standalone.yaml
@@ -25,6 +25,7 @@ resource_registry:
   OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
+  OS::TripleO::Services::LoginDefs: ../../deployment/login-defs/login-defs-baremetal.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
   #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
diff --git a/deployment/login-defs/login-defs-baremetal-puppet.yaml b/deployment/login-defs/login-defs-baremetal.yaml
similarity index 74%
rename from deployment/login-defs/login-defs-baremetal-puppet.yaml
rename to deployment/login-defs/login-defs-baremetal.yaml
index 2aa4eb26c9..0bab0ba799 100644
--- a/deployment/login-defs/login-defs-baremetal-puppet.yaml
+++ b/deployment/login-defs/login-defs-baremetal.yaml
@@ -56,11 +56,12 @@ outputs:
     description: Parameters for configuration of the login.defs file
     value:
       service_name: login_defs
-      config_settings:
-        tripleo::profile::base::login_defs::password_max_days: {get_param: PasswordMaxDays}
-        tripleo::profile::base::login_defs::password_min_days: {get_param: PasswordMinDays}
-        tripleo::profile::base::login_defs::password_warn_age: {get_param: PasswordWarnAge}
-        tripleo::profile::base::login_defs::password_min_len: {get_param: PasswordMinLen}
-        tripleo::profile::base::login_defs::fail_delay: {get_param: FailDelay}
-      step_config: |
-        include ::tripleo::profile::base::login_defs
+      host_prep_tasks:
+        - include_role:
+            name: login-defs
+      ansible_group_vars:
+        tripleo_login_defs_password_max_days: {get_param: PasswordMaxDays}
+        tripleo_login_defs_password_min_days: {get_param: PasswordMinDays}
+        tripleo_login_defs_password_min_len: {get_param: PasswordWarnAge}
+        tripleo_login_defs_password_warn_age: {get_param: PasswordMinLen}
+        tripleo_login_defs_fail_delay: {get_param: FailDelay}
diff --git a/environments/login-defs.yaml b/environments/login-defs.yaml
index 6b32f5cdc8..f05fb8ad47 100644
--- a/environments/login-defs.yaml
+++ b/environments/login-defs.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Services::LoginDefs: ../deployment/login-defs/login-defs-baremetal-puppet.yaml
+  OS::TripleO::Services::LoginDefs: ../deployment/login-defs/login-defs-baremetal.yaml
 
 parameter_defaults:
   PasswordMaxDays: 60