diff --git a/roles/cpp/tasks/cmake.yaml b/roles/cpp/tasks/cmake.yaml
index 04304c8f..e2ff8d0f 100644
--- a/roles/cpp/tasks/cmake.yaml
+++ b/roles/cpp/tasks/cmake.yaml
@@ -1,4 +1,4 @@
-- name: Download cmake installation script
+- name: cmake | Download installation script
   ansible.builtin.get_url:
     url: "{{ manifest.cmake.url }}"
     dest: "{{ dotfiles_tmp }}/cmake.sh"
@@ -9,7 +9,7 @@
   register: cpp_downloaded
   until: cpp_downloaded is not failed
 
-- name: Install cmake
+- name: cmake | Install cmake
   become: true
   ansible.builtin.shell: |
     set -o pipefail
diff --git a/roles/cpp/tasks/gcc.yaml b/roles/cpp/tasks/gcc.yaml
index 60e6ae13..965efb45 100644
--- a/roles/cpp/tasks/gcc.yaml
+++ b/roles/cpp/tasks/gcc.yaml
@@ -1,4 +1,4 @@
-- name: Add toolchain-r gpg key
+- name: gcc | Add toolchain-r gpg key
   become: true
   ansible.builtin.get_url:
     url: "{{ cpp_toolchain_r_key_url }}"
@@ -11,32 +11,32 @@
   # As a workaround we set `changed_when` to false
   changed_when: false
 
-- name: Remove default toolchain-r repository
+- name: gcc | Remove default toolchain-r repository
   become: true
   ansible.builtin.file:
     dest: "{{ cpp_toolchain_r_default_path }}"
     state: absent
 
-- name: Add toolchain-r repository
+- name: gcc | Add toolchain-r repository
   become: true
   ansible.builtin.apt_repository:
     repo: deb [arch=amd64 signed-by={{ apt_keys }}/toolchain-r.asc] {{ cpp_toolchain_r_repo }}
       {{ ansible_distribution_release }} main
 
-- name: Add toolchain-r src repository
+- name: gcc | Add toolchain-r src repository
   become: true
   ansible.builtin.apt_repository:
     repo: deb-src [arch=amd64 signed-by={{ apt_keys }}/toolchain-r.asc] {{ cpp_toolchain_r_repo }}
       {{ ansible_distribution_release }} main
 
-- name: Install GCC
+- name: gcc | Install GCC
   become: true
   ansible.builtin.apt:
     name:
       - gcc-{{ cpp_gcc_version }}
       - g++-{{ cpp_gcc_version }}
 
-- name: Update GCC alternatives
+- name: gcc | Update GCC alternatives
   become: true
   community.general.alternatives:
     name: gcc
@@ -69,7 +69,7 @@
         link: /usr/bin/lto-dump
         path: /usr/bin/lto-dump-{{ cpp_gcc_version }}
 
-- name: Update cc alternative
+- name: gcc | Update cc alternative
   become: true
   community.general.alternatives:
     name: cc
@@ -77,7 +77,7 @@
     path: /usr/bin/gcc-{{ cpp_gcc_version }}
     priority: "{{ cpp_gcc_version }}0"
 
-- name: Fix cyclic cpp symlinks
+- name: gcc | Fix cyclic cpp symlinks
   become: true
   ansible.builtin.shell: |
     set -o pipefail
@@ -90,7 +90,7 @@
   register: cpp_output
   changed_when: '"changed" in cpp_output.stdout'
 
-- name: Update cpp alternative
+- name: gcc | Update cpp alternative
   become: true
   community.general.alternatives:
     name: cpp
diff --git a/roles/cpp/tasks/llvm.yaml b/roles/cpp/tasks/llvm.yaml
index df889863..e7a48deb 100644
--- a/roles/cpp/tasks/llvm.yaml
+++ b/roles/cpp/tasks/llvm.yaml
@@ -1,17 +1,17 @@
-- name: Add LLVM gpg key
+- name: llvm | Add LLVM gpg key
   become: true
   ansible.builtin.get_url:
     url: "{{ cpp_llvm_gpg }}"
     dest: "{{ apt_keys }}/llvm.asc"
     mode: "0o644"
 
-- name: Add LLVM repository
+- name: llvm | Add LLVM repository
   become: true
   ansible.builtin.apt_repository:
     repo: deb [arch=amd64 signed-by={{ apt_keys }}/llvm.asc] {{ cpp_llvm_repo }} llvm-toolchain-{{
       ansible_distribution_release }}-{{ cpp_llvm_version }} main
 
-- name: Install LLVM
+- name: llvm | Install LLVM
   become: true
   ansible.builtin.apt:
     name:
@@ -34,7 +34,7 @@
       - llvm-{{ cpp_llvm_version }}-dev
       - llvm-{{ cpp_llvm_version }}-tools
 
-- name: Update LLVM alternatives
+- name: llvm | Update LLVM alternatives
   become: true
   community.general.alternatives:
     name: clang
@@ -421,7 +421,7 @@
         link: /usr/bin/yaml2obj
         path: /usr/bin/yaml2obj-{{ cpp_llvm_version }}
 
-- name: Update clang++ alternatives
+- name: llvm | Update clang++ alternatives
   become: true
   community.general.alternatives:
     name: clang++
@@ -429,7 +429,7 @@
     path: /usr/bin/clang++-{{ cpp_llvm_version }}
     priority: "{{ cpp_llvm_version }}0"
 
-- name: Update clang-format alternatives
+- name: llvm | Update clang-format alternatives
   become: true
   community.general.alternatives:
     name: clang-format
@@ -441,7 +441,7 @@
         link: /usr/bin/clang-format-diff
         path: /usr/bin/clang-format-diff-{{ cpp_llvm_version }}
 
-- name: Update clang-tidy alternatives
+- name: llvm | Update clang-tidy alternatives
   become: true
   community.general.alternatives:
     name: clang-tidy
@@ -453,7 +453,7 @@
         link: /usr/bin/clang-tidy-diff.py
         path: /usr/bin/clang-tidy-diff-{{ cpp_llvm_version }}.py
 
-- name: Update run-clang-tidy alternatives
+- name: llvm | Update run-clang-tidy alternatives
   become: true
   community.general.alternatives:
     name: run-clang-tidy
diff --git a/roles/cpp/tasks/vcpkg.yaml b/roles/cpp/tasks/vcpkg.yaml
index 735a04db..5bbd9f7d 100644
--- a/roles/cpp/tasks/vcpkg.yaml
+++ b/roles/cpp/tasks/vcpkg.yaml
@@ -1,4 +1,4 @@
-- name: Download vcpkg
+- name: vcpkg | Download vcpkg
   ansible.builtin.git:
     repo: "{{ manifest.vcpkg.url }}"
     dest: "{{ home }}/.local/vcpkg"
diff --git a/roles/dotfiles/tasks/main.yaml b/roles/dotfiles/tasks/main.yaml
index e973136a..29787c7f 100644
--- a/roles/dotfiles/tasks/main.yaml
+++ b/roles/dotfiles/tasks/main.yaml
@@ -9,6 +9,8 @@
     src: "{{ playbook_dir }}"
     dest: "{{ dotfiles_parent_path }}"
     rsync_opts: "--filter=':- .gitignore'"
+    owner: false
+    group: false
   register: dotfiles_changed
   changed_when: dotfiles_changed.stdout_lines | length >= 10