diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index 530842726..7e1c1c308 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -27,11 +27,12 @@
     repo: https://github.com/llaske/sugarizer
     dest: "{{ sugarizer_location }}"
     version: "{{ sugarizer_git_version }}"
+  when: internet_available
 
 - name: Move /opt/iiab/sugarizer to /opt/iiab/{{ sugarizer_version }}
-  move:
-    src: "{{ sugarizer_location }}/sugarizer"
-    dest: "{{ sugarizer_location }}/{{ sugarizer_version }}"
+  command: mv "{{ sugarizer_location }}/sugarizer" "{{ sugarizer_location }}/{{ sugarizer_version }}"
+  args:
+    creates: "{{ sugarizer_location }}/{{ sugarizer_version }}"
 
 - name: Create symbolic link /opt/iiab/sugarizer -> /opt/iiab/{{ sugarizer_version }}
   file:
@@ -63,11 +64,12 @@
     repo: https://github.com/llaske/sugarizer-server
     dest: "{{ sugarizer_location }}"
     version: "{{ sugarizer_server_git_version }}"
+  when: internet_available
 
 - name: Move /opt/iiab/sugarizer-server to /opt/iiab/{{ sugarizer_server_version }}
-  move:
-    src: "{{ sugarizer_location }}/sugarizer-server"
-    dest: "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
+  command: mv "{{ sugarizer_location }}/sugarizer-server" "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
+  args:
+    creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
 
 - name: Create symbolic link /opt/iiab/sugarizer-server -> /opt/iiab/{ sugarizer_server_version }}
   file: