diff --git a/handlers/main.yml b/handlers/main.yml
index e8c0bca..eb9d014 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -28,3 +28,21 @@
     - setup wifi
     - reload wifi
     - restart network
+
+- name: uci commit
+  nohup:
+    command: uci commit
+    delay: 1
+  when: "'openwrt' in group_names"
+
+- name: restart firewall
+  nohup:
+    command: /etc/init.d/firewall restart
+    delay: 1
+  when: "'openwrt' in group_names"
+
+- name: reload system
+  nohup:
+    command: /etc/init.d/system reload
+    delay: 1
+  when: "'openwrt' in group_names"
diff --git a/tasks/main.yml b/tasks/main.yml
index 16978c6..1bdd420 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,6 +10,7 @@
     ansible_ssh_use_tty: "{{ openwrt_ssh_use_tty }}"
     ansible_scp_if_ssh: "{{ openwrt_scp_if_ssh }}"
     ansible_remote_tmp: "{{ openwrt_remote_tmp }}"
+    ansible_scp_extra_args: -O
   when: "'openwrt' in group_names"
   tags: always