diff --git a/tasks/install.yml b/tasks/install.yml
index d6b9f30dc261d795a7b5ded0a829ba6a46ef9bb0..3fab8e1370a5c8adf72eb3286fc199635b5a175a 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -8,11 +8,22 @@
     dest: "/opt/netdata"
     force: yes
   register: netdata_clone
+  when: netdata_local_archive is not defined
+  notify:
+    - "Restart NetData"
+
+- name: "Extract NetData Archive"
+  unarchive:
+    src: '/opt/{{ netdata_local_archive }}.zip'
+    dest: '/opt'
+    remote_src: yes
+  register: netdata_clone
+  when: netdata_local_archive is defined
   notify:
     - "Restart NetData"
 
 - name: "Install and configure NetData"
   shell: ./netdata-installer.sh --dont-wait
   args:
-    chdir: /opt/netdata
+    chdir: /opt/{{ netdata_local_archive|default('netdata') }}
   when: netdata_clone.changed