diff --git a/roles/bootstrap-os/tasks/bootstrap-ubuntu.yml b/roles/bootstrap-os/tasks/bootstrap-ubuntu.yml
index 5d2050b6dd8aae35b3b2f9493f63633fa34efd98..c33970252eb21e432ce2bf45fe7353944a414951 100644
--- a/roles/bootstrap-os/tasks/bootstrap-ubuntu.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-ubuntu.yml
@@ -19,6 +19,22 @@
   tags:
     - facts
 
+- name: Add proxy to /etc/apt/apt.conf if http_proxy is defined
+  lineinfile:
+    path: "/etc/apt/apt.conf"
+    line: 'Acquire::http::proxy "{{http_proxy}}";'
+    create: yes
+    state: present
+  when: http_proxy is defined
+
+- name: Add proxy to /etc/apt/apt.conf if https_proxy is defined
+  lineinfile:
+    path: "/etc/apt/apt.conf"
+    line: 'Acquire::https::proxy "{{https_proxy}}";'
+    create: yes
+    state: present
+  when: https_proxy is defined
+
 - name: Bootstrap | Install python 2.x and pip
   raw:
     apt-get update && \