diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml
index 0f61bcc290..7b15aa9b49 100644
--- a/playbooks/repo-server.yml
+++ b/playbooks/repo-server.yml
@@ -59,7 +59,7 @@
     - { role: "repo_server", tags: [ "repo-server" ] }
     - role: "rsyslog_client"
       rsyslog_client_log_rotate_file: repo_nginx_log_rotate
-      rsyslog_client_log_dir: "/var/log/nginx"
+      rsyslog_client_log_dir: "/var/log/{{ repo_service_user_name }}"
       rsyslog_client_log_files:
         - /var/log/rsyncd.log
       rsyslog_client_config_name: "99-repo-nginx-rsyslog-client.conf"
@@ -67,9 +67,9 @@
         - "repo-nginx-rsyslog-client"
         - "rsyslog-client"
     - role: "rsyslog_client"
-      rsyslog_client_log_rotate_file: repo_log_rotate
-      rsyslog_client_log_dir: "/var/log/repo"
-      rsyslog_client_config_name: "99-repo-rsyslog-client.conf"
+      rsyslog_client_log_rotate_file: lsyncd_log_rotate
+      rsyslog_client_log_dir: "/var/log/lsyncd"
+      rsyslog_client_config_name: "99-lsyncd-rsyslog-client.conf"
       tags:
         - "repo-rsyslog-client"
         - "rsyslog-client"
diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml
index ddaad26c6e..db7148ce59 100644
--- a/playbooks/utility-install.yml
+++ b/playbooks/utility-install.yml
@@ -62,6 +62,14 @@
       when: is_metal | bool
       tags:
         - utility-logs
+    - name: Create log directory
+      file:
+        dest: "/var/log/utility"
+        state: "directory"
+        force: "yes"
+      when: not is_metal | bool
+      tags:
+        - utility-logs
   roles:
     - { role: "galera_client", tags: [ "utility-galera-client" ] }
     - { role: "pip_lock_down", tags: [ "utility-pip-lock-down" ] }
diff --git a/requirements.txt b/requirements.txt
index 21ce109add..b25ad0abb8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 Jinja2>=2.6             # ansible
 netaddr>=0.7.12         # playbooks/inventory/dynamic_inventory.py
-paramiko>=1.13.0        # ansible
+paramiko>=1.16.0,<2     # ansible and nova
 PrettyTable>=0.7,<0.8   # scripts/inventory-manage.py
 pycrypto>=2.6           # ansible
 PyYAML>=3.1.0           # ansible