diff --git a/roles/rudder-node/tasks/centos.yml b/roles/rudder-node/tasks/centos.yml
index 137eaa5..9f00164 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: add rudder repo url -- centos
+- name: Remove old rudder repo url -- centos
   yum_repository:
     name: rudder
     description: Rudder 4.1 EL repository
@@ -12,10 +12,21 @@
     baseurl: http://www.rudder-project.org/rpm-4.1/RHEL_$releasever/
     gpgcheck: yes
     gpgkey: http://www.rudder-project.org/rpm-4.1/RHEL_$releasever/repodata/repomd.xml.key
+    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: install rudder agent -- centos
-  yum: name=rudder-agent state=present update_cache=yes
+  yum: name=rudder-agent state=latest update_cache=yes
   when: ansible_distribution == 'CentOS' or ansible_distribution == 'CloudLinux' or ansible_distribution == 'Virtuozzo'
 
 - name: configure rudder server -- centos
diff --git a/roles/rudder-node/tasks/debian.yml b/roles/rudder-node/tasks/debian.yml
index eb27dd9..83a7ebd 100644
--- a/roles/rudder-node/tasks/debian.yml
+++ b/roles/rudder-node/tasks/debian.yml
@@ -4,16 +4,25 @@
   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: add rudder repo url -- debian
+- name: remove old rudder repo url -- debian
   apt_repository:
     repo: 'deb http://www.rudder-project.org/apt-4.1/ {{ansible_distribution_release}} main'
+    state: absent
+    filename: 'rudder'
+    update_cache: yes
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+
+- name: Add rudder repo url -- debian
+  apt_repository:
+    repo: 'deb http://repository.rudder.io/apt/5.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=present update_cache=yes
+  apt: pkg=rudder-agent state=latest update_cache=yes
   when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
 - name: configure rudder server -- debian