diff --git a/jcloud/playbooks/roles/agent/tasks/main.yml b/jcloud/playbooks/roles/agent/tasks/main.yml
index d231b17..2204ea3 100644
--- a/jcloud/playbooks/roles/agent/tasks/main.yml
+++ b/jcloud/playbooks/roles/agent/tasks/main.yml
@@ -41,7 +41,19 @@
     msg: "Failed to clone agent repository after multiple attempts"
   when: clone_result is failed or (clone_result is success and not git_check.stat.exists)
 
-- name: Install Agent
+- name: Upgrade pip and setuptools
+  become: yes
+  become_user: jingrow
+  pip:
+    name:
+      - pip
+      - setuptools
+      - wheel
+    state: latest
+    virtualenv: /home/jingrow/agent/env
+    virtualenv_python: python3
+
+- name: Install Agent with dependencies
   become: yes
   become_user: jingrow
   pip:
@@ -49,6 +61,16 @@
     virtualenv: /home/jingrow/agent/env
     virtualenv_python: python3
     editable: yes
+    extra_args: "--upgrade --force-reinstall"
+
+- name: Ensure zope.interface is installed
+  become: yes
+  become_user: jingrow
+  pip:
+    name: zope.interface
+    virtualenv: /home/jingrow/agent/env
+    virtualenv_python: python3
+    state: forcereinstall
 
 - name: Generate Agent Configuration File
   become: yes