diff --git a/config/ansible/tasks/servers/server.yml b/config/ansible/tasks/servers/server.yml
index f4d9ab6..bc95a38 100644
--- a/config/ansible/tasks/servers/server.yml
+++ b/config/ansible/tasks/servers/server.yml
@@ -12,7 +12,29 @@
   ignore_errors: true
   become: true
 
-- name: Update/Checkout /mnt/services repository
+- name: Check if services git repo already exists
+  ansible.builtin.stat:
+    path: "/mnt/services/.git"
+  register: git_dir_check
+  become: true
+  when: mnt_services_check.rc == 0
+
+- name: Clean /mnt/services directory
+  ansible.builtin.shell: find /mnt/services -mindepth 1 -maxdepth 1 -exec rm -rf {} \;
+  become: true
+  when: mnt_services_check.rc == 0 and not git_dir_check.stat.exists|default(false)
+
+- name: Clone /mnt/services repository (initial clone)
+  ansible.builtin.git:
+    repo: "https://git.mvl.sh/vleeuwenmenno/services.git"
+    dest: "/mnt/services"
+    version: "main"
+  become: true
+  register: git_result
+  changed_when: git_result.changed
+  when: mnt_services_check.rc == 0 and not git_dir_check.stat.exists|default(false)
+
+- name: Update /mnt/services repository (if already exists)
   ansible.builtin.git:
     repo: "https://git.mvl.sh/vleeuwenmenno/services.git"
     dest: "/mnt/services"
@@ -22,7 +44,7 @@
   become: true
   register: git_result
   changed_when: git_result.changed
-  when: mnt_services_check.rc == 0
+  when: mnt_services_check.rc == 0 and git_dir_check.stat.exists|default(false)
 
 - name: Ensure /mnt/services ownership to users
   ansible.builtin.file:
@@ -31,4 +53,4 @@
     recurse: true
     state: directory
   become: true
-  when: mnt_services_check.rc == 0
\ No newline at end of file
+  when: mnt_services_check.rc == 0