diff --git a/playbooks/build_tasmota_v2.yml b/playbooks/build_tasmota_v2.yml
index da8a257..d7e5abf 100644
--- a/playbooks/build_tasmota_v2.yml
+++ b/playbooks/build_tasmota_v2.yml
@@ -7,7 +7,7 @@
   tasks:
     - name: Build tasmota
       ansible.builtin.shell: 
-        cmd: 'git fetch https://github.com/arendst/Tasmota.git development'
+        cmd: 'git fetch https://github.com/arendst/Tasmota.git {{ BRANCH }}'
         chdir: /share/docker_data/docker-tasmota/Tasmota
       when: inventory_hostname in groups['nas']
 
@@ -25,6 +25,10 @@
       ansible.builtin.shell: 
         cmd: '/share/ZFS530_DATA/.qpkg/container-station/bin/docker run --rm -v /share/docker_data/docker-tasmota/Tasmota:/tasmota -u $UID:$GID {{ DOCKER_IMAGE }} -e {{ FWS }}'
         chdir: /share/docker_data/docker-tasmota/
-      when: inventory_hostname in groups['nas']
-
+      when: FWS != "all"
+    - name: Build tasmota
+      ansible.builtin.shell: 
+        cmd: '/share/ZFS530_DATA/.qpkg/container-station/bin/docker run --rm -v /share/docker_data/docker-tasmota/Tasmota:/tasmota -u $UID:$GID {{ DOCKER_IMAGE }}'
+        chdir: /share/docker_data/docker-tasmota/
+      when: FWS == "all"
       
\ No newline at end of file