diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 66cef4599c..997aee882c 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -252,7 +252,15 @@ outputs:
                 path: "/etc/leapp/transaction/to_install"
                 line: "{{ item }}"
               loop: "{{ pkg_to_install }}"
-
+            - name: "check sshd_config file"
+              stat:
+                path: "/etc/ssh/sshd_config"
+              register: sshd_config_result
+            - name: "add PermitRootLogin option for leapp"
+              lineinfile:
+                path: "/etc/ssh/sshd_config"
+                regexp: "^(# *)?PermitRootLogin"
+                line: "PermitRootLogin without-password"
         - name: system_upgrade_prepare step 4
           tags:
             - never