diff --git a/tasks/prepare.yml b/tasks/prepare.yml
index 12f07fe..77b668d 100644
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -8,11 +8,8 @@
 
     - name: Install required dependencies
       pip:
-        name: "{{ item }}"
+        name: "{{ __drone_pip_dependencies }}"
         state: present
-      with_items:
-        - docker
-        - docker-compose
   become: True
   become_user: root
 
diff --git a/tasks/setup.yml b/tasks/setup.yml
index 802568a..766d865 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -1,7 +1,7 @@
 ---
 - name: Concat lists for proxy setup
   set_fact:
-    droneci_no_proxy: "{{ __droneci_default_no_proxy }} + {{ droneci_no_proxy }}"
+    droneci_no_proxy: "{{ __droneci_default_no_proxy }} + {{ droneci_no_proxy | default([]) }}"
 
 - block:
     - name: Deploy compose file to '{{ droneci_service_directory }}'
diff --git a/vars/main.yml b/vars/main.yml
index 0b18f80..860139d 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -2,3 +2,7 @@
 __droneci_default_no_proxy:
   - droneserver
   - droneagent
+
+__drone_pip_dependencies:
+  - docker
+  - docker-compose