diff --git a/local.yml b/local.yml
index 466be3f4870aa654eb094a3a7ba39099b2b035ed..4a61bae86cb16ffa072ebc4f1ba48868520a5e7c 100644
--- a/local.yml
+++ b/local.yml
@@ -18,14 +18,16 @@
     #     update_cache: true
     #     force_apt_get: true
 
-    # - name: Install pip3
-    #   become: true
-    #   apt:
-    #     update_cache: true
-    #     name:
-    #       - python3-pip
-    #       - libffi-dev # This is needed for jupyter on aarch64 to compile its C backend
-    #     state: present
+    - name: Update apt cache & install base requirements
+      become: true
+      apt:
+        update_cache: true
+        state: present
+        name:
+          - python3-pip
+          - python3-venv
+    #     - libffi-dev # This is needed for jupyter on aarch64 to compile its C backend
+    
 
   roles:
     - jupyter-lab
diff --git a/roles/jupyter-lab/tasks/main.yml b/roles/jupyter-lab/tasks/main.yml
index f5b9df263bb95ed9ffc86819281131930634a788..f7ded5a3554bf3ac3edd8e2452aa62ecda4934c5 100644
--- a/roles/jupyter-lab/tasks/main.yml
+++ b/roles/jupyter-lab/tasks/main.yml
@@ -8,17 +8,6 @@
     owner: "{{ target_user }}"
     group: "{{ target_user }}"
 
-# This should be optimized so that only one check / install is needed
-# Still we should make sure that pip3 is actually installed before trying to use it
-- name: Install dependecies
-  become: true
-  apt:
-    name:
-      - python3-pip
-      - python3-venv
-    state: present
-    update_cache: true
-
 - name: Install jupyter-lab
   pip:
     virtualenv_command: /usr/bin/python3 -m venv
diff --git a/roles/ml-python-packages/tasks/main.yml b/roles/ml-python-packages/tasks/main.yml
index ee1c3cf783e0c088e45077b4421e4ca39fe6ba75..168e1aede0d33e76b57516e8c188f5b63f916abd 100644
--- a/roles/ml-python-packages/tasks/main.yml
+++ b/roles/ml-python-packages/tasks/main.yml
@@ -1,16 +1,12 @@
 ---
 # roles/ml-python-packages
 
-# This should be optimized so that only one check / install for pip3 is needed
-# Still we should make sure that pip3 is actually installed before trying to use it
 - name: Install dependecies
   become: true
   apt:
     name:
-      - python3-pip
       - libatlas-base-dev
     state: present
-    update_cache: true
 
 - name: Copy requirements.txt to remote fs
   copy:
@@ -22,13 +18,4 @@
     virtualenv_command: /usr/bin/python3 -m venv
     requirements: /tmp/ml-requirements.txt
     virtualenv: "/home/{{ target_user }}/.ml-venv"
-    # name:
-      # - numpy
-      # - sklearn
-      # - matplotlib
-      # - pandas
-      # - Pillow
-      # - torch
-      # - torchvision
-      # - fastai
-    # state: present
+