diff --git a/tasks/main.yaml b/tasks/main.yaml
index 70cb56a..bf0f713 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -24,21 +24,6 @@
     owner: root
     group: ssl-cert
 
-- name: install buildbot
-  pip:
-    name: buildbot[bundle]
-    executable: pip3
-
-- name: install gitea integration for buildbot
-  pip:
-    name: buildbot_gitea
-    executable: pip3
-
-- name: install service_identity
-  pip:
-    name: service_identity
-    executable: pip3
-
 - import_tasks: database.yaml
 
 - import_tasks: master.yaml
diff --git a/tasks/master.yaml b/tasks/master.yaml
index ef9482a..267f0d8 100644
--- a/tasks/master.yaml
+++ b/tasks/master.yaml
@@ -1,5 +1,14 @@
 ---
 
+- name: pip3 packages
+  pip:
+    name:
+      - buildbot[bundle]
+      - buildbot_gitea
+      - service_identity
+      - zope.interface>=4.4.2
+    executable: pip3
+
 - name: buildbot system group
   group:
     name: buildbot
@@ -30,7 +39,7 @@
     dest: /etc/systemd/system/buildbot@.service
   notify: systemd daemon reload
 
-- name: initiate buildbot master configurations
+- name: initiate buildbot master
   command: buildbot create-master --db {{buildbot_database_url}} --relocatable master
   become: true
   become_user: buildbot