diff --git a/tasks/main.yml b/tasks/main.yml
index 8b73e83fd11be60b394a192a237995390123fc07..b7ae77f01d13fc2474515f7dafdef46129c3a49e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,13 +9,19 @@
 
   - name: "Apt Repository"
     apt_repository:
-      repo='deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main'
+      repo='deb http://ppa.launchpad.net/webupd8team/java/ubuntu {{ ansible_distribution_release }} main'
       state='present'
       mode=644
 
+  - name: "Accept License"
+    shell: '{{ item }}'
+    with_items:
+      - 'echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections'
+      - 'echo debconf shared/accepted-oracle-license-v1-1 seen true | /usr/bin/debconf-set-selections'
+
   - name: "Install Agent"
     apt:
-      pkg='openjdk-8-jre'
+      pkg='oracle-java8-installer'
       state='installed'
       update_cache=yes
       force=yes