diff --git a/roles/rudder-node/files/rudder_override.conf b/roles/rudder-node/files/rudder_override.conf
new file mode 100644
index 0000000..226ea12
--- /dev/null
+++ b/roles/rudder-node/files/rudder_override.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment=VERBOSITY_OPTION=
\ No newline at end of file
diff --git a/roles/rudder-node/handlers/main.yml b/roles/rudder-node/handlers/main.yml
index dba70bd..1ece6b8 100644
--- a/roles/rudder-node/handlers/main.yml
+++ b/roles/rudder-node/handlers/main.yml
@@ -8,3 +8,9 @@
 
 - name: agent-run
   command: rudder agent run
+
+- name: reload systemd
+  command: systemctl daemon-reload
+
+- name: restart rudder-cf-serverd
+  service: name=rudder-cf-serverd state=restarted
\ No newline at end of file
diff --git a/roles/rudder-node/tasks/centos.yml b/roles/rudder-node/tasks/centos.yml
index 9f00164..4ddeb11 100644
--- a/roles/rudder-node/tasks/centos.yml
+++ b/roles/rudder-node/tasks/centos.yml
@@ -4,7 +4,7 @@
   rpm_key: key="https://www.rudder-project.org/apt-repos/rudder_apt_key.pub" state=present
   when: ansible_distribution == 'CentOS' or ansible_distribution == 'CloudLinux' or ansible_distribution == 'Virtuozzo'
 
-- name: Remove old rudder repo url -- centos
+- name: Remove 4.1 rudder repo url -- centos
   yum_repository:
     name: rudder
     description: Rudder 4.1 EL repository
@@ -15,15 +15,26 @@
     state: absent
   when: ansible_distribution == 'CentOS' or ansible_distribution == 'CloudLinux' or ansible_distribution == 'Virtuozzo'
 
-- name: add rudder repo url -- centos                                                                                                                                                                                
-  yum_repository:                                                                                                                                                                                                    
-    name: rudder                                                                                                                                                                                                     
-    description: Rudder 5.0 EL repository                                                                                                                                                                            
-    file: rudder_repo                                                                                                                                                                                                
-    baseurl: http://repository.rudder.io/rpm/5.0/RHEL_$releasever/                                                                                                                                                 
-    gpgcheck: yes                                                                                                                                                                                                    
-    gpgkey: https://repository.rudder.io/rpm/rudder_rpm_key.pub                                                                                                                           
-  when: ansible_distribution == 'CentOS' or ansible_distribution == 'CloudLinux' or ansible_distribution == 'Virtuozzo' 
+- name: Remove 5.0 rudder repo url -- centos
+  yum_repository:
+    name: rudder
+    description: Rudder 5.0 EL repository
+    file: rudder_repo
+    baseurl: http://repository.rudder.io/rpm/5.0/RHEL_$releasever/
+    gpgcheck: yes
+    gpgkey: https://repository.rudder.io/rpm/rudder_rpm_key.pub
+    state: absent
+  when: ansible_distribution == 'CentOS' or ansible_distribution == 'CloudLinux' or ansible_distribution == 'Virtuozzo'
+
+- name: add 6.0 rudder repo url -- centos
+  yum_repository:
+    name: rudder
+    description: Rudder 6.0
+    file: rudder_repo
+    baseurl: http://repository.rudder.io/rpm/6.0/RHEL_$releasever/
+    gpgcheck: yes
+    gpgkey: https://repository.rudder.io/rpm/rudder_rpm_key.pub
+  when: ansible_distribution == 'CentOS' or ansible_distribution == 'CloudLinux' or ansible_distribution == 'Virtuozzo'
 
 - name: install rudder agent -- centos
   yum: name=rudder-agent state=latest update_cache=yes
diff --git a/roles/rudder-node/tasks/debian.yml b/roles/rudder-node/tasks/debian.yml
index 83a7ebd..d9db292 100644
--- a/roles/rudder-node/tasks/debian.yml
+++ b/roles/rudder-node/tasks/debian.yml
@@ -4,7 +4,7 @@
   apt_key: url="https://www.rudder-project.org/apt-repos/rudder_apt_key.pub" state=present
   when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
-- name: remove old rudder repo url -- debian
+- name: remove 4.1 rudder repo url -- debian
   apt_repository:
     repo: 'deb http://www.rudder-project.org/apt-4.1/ {{ansible_distribution_release}} main'
     state: absent
@@ -12,18 +12,26 @@
     update_cache: yes
   when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
-- name: Add rudder repo url -- debian
+- name: remove 5.0 rudder repo url -- debian
   apt_repository:
     repo: 'deb http://repository.rudder.io/apt/5.0/ {{ansible_distribution_release}} main'
+    state: absent
+    filename: 'rudder'
+    update_cache: yes
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+
+- name: Add 6.0 rudder repo url -- debian
+  apt_repository:
+    repo: 'deb http://repository.rudder.io/apt/6.0/ {{ansible_distribution_release}} main'
     state: present
     filename: 'rudder'
     update_cache: yes
   when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
-  notify: agent-run
 
 - name: install rudder agent -- debian
   apt: pkg=rudder-agent state=latest update_cache=yes
   when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+  notify: agent-run
 
 - name: configure rudder server -- debian
   template:  src=policy_server.dat.tpl dest=/var/rudder/cfengine-community/policy_server.dat
@@ -32,4 +40,3 @@
       - rudder-start
       - agent-inventory
       - agent-run
-  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
diff --git a/roles/rudder-node/tasks/main.yml b/roles/rudder-node/tasks/main.yml
index 91d4026..f89031c 100644
--- a/roles/rudder-node/tasks/main.yml
+++ b/roles/rudder-node/tasks/main.yml
@@ -4,5 +4,18 @@
 - include: centos.yml
   when: ansible_distribution == 'CentOS' or ansible_distribution == 'CloudLinux' or ansible_distribution == 'Virtuozzo'
 
+- name: Create directory to override conf in systemd
+  file:
+    path: /etc/systemd/system/rudder-cf-serverd.service.d
+    state: directory
+
+- name: Disable 5.0.9 default log verbosity
+  copy:
+    src: rudder_override.conf
+    dest: /etc/systemd/system/rudder-cf-serverd.service.d/override.conf
+  notify:
+    - reload systemd
+    - restart rudder-cf-serverd
+
 - fail: msg="You can now connect to your rudder server and allow new nodes"
   ignore_errors: yes