diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index dd0e5f194c..4f1b70c316 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -12,9 +12,11 @@
   loop:
     - ca-certificates
     - apt-transport-https
+  when:
+    - ansible_os_family == "Debian"
 
 - name: common | install snapd
-  ansible.builtin.apt:
+  ansible.builtin.package:
     name: "{{ item }}"
     state: present
   loop:
@@ -28,7 +30,7 @@
   when: running_on_server
 
 - name: common | install building software and build essentials
-  ansible.builtin.apt:
+  ansible.builtin.package:
     name: "{{ item }}"
     state: present
     update_cache: true
@@ -40,6 +42,11 @@
     dest: "/etc/tmux.conf"
     mode: 0644
 
+- name: common | create vim directory
+  ansible.builtin.file:
+    path: /etc/vim
+    state: directory
+
 - name: common | copy vimrc
   ansible.builtin.copy:
     src: files/vimrc.local
@@ -47,7 +54,7 @@
     mode: 0644
 
 - name: common | install configured dependencies
-  ansible.builtin.apt:
+  ansible.builtin.package:
     name: '{{ configured_dependencies }}'
     state: present
 
@@ -58,12 +65,16 @@
   retries: 3
   delay: 60
   until: duf_repo is succeeded
-  when: running_on_server
+  when:
+    - running_on_server
+    - ansible_os_family == "Debian"
 
 - name: common | install dust
   ansible.builtin.apt:
     deb: "{{ dust_url }}/v{{ dust_version }}/du-dust_{{ dust_version }}-1_amd64.deb"
-  when: running_on_server
+  when:
+    - running_on_server
+    - ansible_os_family == "Debian"
 
 - name: common | install fdfind
   ansible.builtin.apt:
diff --git a/roles/common/tasks/vector.yml b/roles/common/tasks/vector.yml
index b8dc9f3a80..f038fa6622 100644
--- a/roles/common/tasks/vector.yml
+++ b/roles/common/tasks/vector.yml
@@ -8,13 +8,19 @@
     - "https://keys.datadoghq.com/DATADOG_APT_KEY_CURRENT.public"
     - "https://keys.datadoghq.com/DATADOG_APT_KEY_F14F620E.public"
     - "https://keys.datadoghq.com/DATADOG_APT_KEY_C0962C7D.public"
+  when:
+    - ansible_os_family == "Debian"
 
 - name: common | Install Vector Datadog Repo
   ansible.builtin.apt_repository:
     repo: "deb [signed-by=/usr/share/keyrings/datadog-archive-keyring.gpg] https://apt.vector.dev/ stable vector-0"
     filename: "vector"
+  when:
+    - ansible_os_family == "Debian"
 
 - name: common | install vector
   ansible.builtin.apt:
     name: vector
     update_cache: true
+  when:
+    - ansible_os_family == "Debian"