diff --git a/common/docker/tasks/main.yml b/common/docker/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0eec4ee06feac6885312d556507ed2041953d83b
--- /dev/null
+++ b/common/docker/tasks/main.yml
@@ -0,0 +1,25 @@
+---
+
+- name: install deb packages
+  apt:
+    pkg: "{{ item }}"
+    update_cache: yes
+    state: installed
+  with_items:
+    - docker-ce
+    - python 
+    - python-pip
+    
+- name: uninstall pip packages
+  pip: 
+    name: docker-py
+    state: absent
+
+- name: install pip packages
+  pip: 
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - docker
+    - docker-compose 
+
diff --git a/host_vars/warpsrvint b/host_vars/warpsrvint
index 48624fcc074506f88ecfc65627dea3e741a3e7d3..e0a96534ced2b349d6ffa6a252ed600d87441942 100644
--- a/host_vars/warpsrvint
+++ b/host_vars/warpsrvint
@@ -10,9 +10,10 @@ debian_sources:
   - "deb http://security.debian.org/ jessie/updates main contrib non-free"
   - "deb http://debian.uni-duisburg-essen.de/debian/ jessie-updates main contrib non-free"
   - "deb https://apt.dockerproject.org/repo debian-jessie main"
-  - "deb http://http.debian.net/debian jessie-backports main"
+  - "deb [arch=amd64] https://download.docker.com/linux/debian jessie stable"
 
 debian_keys:
+  - "https://download.docker.com/linux/debian/gpg"
 
 webserver_domains: 
   - "infra"