diff --git a/cci_worker.yml b/cci_worker.yml
index 39e7f41..574900b 100644
--- a/cci_worker.yml
+++ b/cci_worker.yml
@@ -52,15 +52,10 @@
         - podman
         - podman-docker
         - jq
+        - git
       loop_control:
         loop_var: pretaskfiles
 
-    - name: "Ensure jaegertracing docker image is downloaded for tests"
-      containers.podman.podman_image:
-        name: "quay.io/jaegertracing/all-in-one:latest"
-      become: yes
-      become_user: "{{cci_worker_username}}"
-
   tasks:
     - ansible.builtin.include_role:
         name: "{{ taskfiles }}"
@@ -74,3 +69,10 @@
         - old_releases
       loop_control:
         loop_var: taskfiles
+
+  post_tasks:
+    - name: "Ensure jaegertracing docker image is downloaded for tests"
+      containers.podman.podman_image:
+        name: "quay.io/jaegertracing/all-in-one:latest"
+      become: yes
+      become_user: "{{cci_worker_username}}"
diff --git a/roles/cci_worker/tasks/main.yml b/roles/cci_worker/tasks/main.yml
index 2607b32..31cecf6 100644
--- a/roles/cci_worker/tasks/main.yml
+++ b/roles/cci_worker/tasks/main.yml
@@ -100,6 +100,14 @@
         owner: "{{ cci_worker_username }}"
         group: "{{ cci_worker_username }}"
 
+    - name: "Create maven settings directory"
+      ansible.builtin.file:
+        path: "/home/{{ cci_worker_username }}/.m2/"
+        state: directory
+        mode: "0755"
+        owner: "{{ cci_worker_username }}"
+        group: "{{ cci_worker_username }}"
+
     - name: "Configure Maven settings.xml"
       ansible.builtin.template:
         src: templates/settings.xml.j2