diff --git a/tasks/docker.yml b/tasks/docker.yml
index 00eb7bb..15c1875 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -1,3 +1,7 @@
+- name: Docker Dienst starten
+  shell:
+    "systemctl start docker; systemctl enable docker"
+
 - name: Ensure Unifi Docker image is pulled
   docker_image:
     name: "{{ unifi_version }}"
diff --git a/tasks/firewall.yml b/tasks/firewall.yml
index 8b81ac9..c8834d9 100644
--- a/tasks/firewall.yml
+++ b/tasks/firewall.yml
@@ -1,2 +1,3 @@
 - name: open bareos port
   firewalld: port=9102/tcp zone=public permanent=true state=enabled immediate=yes
+  when: unifi_bareos
diff --git a/tasks/starten.yml b/tasks/starten.yml
index ba5e588..af1bd76 100644
--- a/tasks/starten.yml
+++ b/tasks/starten.yml
@@ -1,3 +1,3 @@
-- name: Dienste starten
+- name: Unifi Dienst starten
   shell:
-    "systemctl start docker; systemctl enable docker; systemctl daemon-reload; systemctl start unifi"
+    "systemctl daemon-reload; systemctl start unifi"