diff --git a/config/ansible/tasks/global/symlinks.yml b/config/ansible/tasks/global/symlinks.yml
index f5336a0..0caf7dd 100644
--- a/config/ansible/tasks/global/symlinks.yml
+++ b/config/ansible/tasks/global/symlinks.yml
@@ -1,33 +1,37 @@
 ---
-- name: Set user home directory
-  ansible.builtin.set_fact:
-    user_home: "{{ ansible_env.HOME if ansible_user_id == 'root' else lookup('env', 'HOME') }}"
+- name: Server setup
+  block:
+  - name: Set user home directory
+    ansible.builtin.set_fact:
+      user_home: "{{ ansible_env.HOME if ansible_user_id == 'root' else lookup('env', 'HOME') }}"
 
-- name: Create basic symlinks
-  ansible.builtin.file:
-    src: "{{ item.src | replace('~', user_home) | replace('$DOTFILES_PATH', lookup('env', 'DOTFILES_PATH')) }}"
-    dest: "{{ item.dest | replace('~', user_home) }}"
-    state: link
-    force: true
-    follow: false
-  loop:
-    - { src: "$DOTFILES_PATH/config/home-manager", dest: "~/.config/home-manager" }
-    - { src: "$DOTFILES_PATH/config/ssh/config", dest: "~/.ssh/config" }
-    - { src: "$DOTFILES_PATH/config/starship.toml", dest: "~/.config/starship.toml" }
-    - { src: "$DOTFILES_PATH/.bashrc", dest: "~/.bashrc.extra" }
+  - name: Create basic symlinks
+    ansible.builtin.file:
+      src: "{{ item.src | replace('~', user_home) | replace('$DOTFILES_PATH', lookup('env', 'DOTFILES_PATH')) }}"
+      dest: "{{ item.dest | replace('~', user_home) }}"
+      state: link
+      force: true
+      follow: false
+    loop:
+      - { src: "$DOTFILES_PATH/config/home-manager", dest: "~/.config/home-manager" }
+      - { src: "$DOTFILES_PATH/config/ssh/config", dest: "~/.ssh/config" }
+      - { src: "$DOTFILES_PATH/config/starship.toml", dest: "~/.config/starship.toml" }
+      - { src: "$DOTFILES_PATH/.bashrc", dest: "~/.bashrc.extra" }
 
-- name: Create gitconfig symlink
-  ansible.builtin.file:
-    src: "{{ gitconfig_mapping[inventory_hostname] | replace('~', user_home) | replace('$DOTFILES_PATH', lookup('env', 'DOTFILES_PATH')) }}"
-    dest: "{{ user_home }}/.gitconfig"
-    state: link
-    force: true
-    follow: false
-  vars:
-    gitconfig_mapping:
-      mennos-desktop: "$DOTFILES_PATH/config/git/gitconfig.linux"
-      mennos-laptop-w: "$DOTFILES_PATH/config/git/gitconfig.wsl"
-      mennos-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
-      mennos-cloud-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
-      mennos-vm: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
-      dotfiles-test: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
+  - name: Create gitconfig symlink
+    ansible.builtin.file:
+      src: "{{ gitconfig_mapping[inventory_hostname] | replace('~', user_home) | replace('$DOTFILES_PATH', lookup('env', 'DOTFILES_PATH')) }}"
+      dest: "{{ user_home }}/.gitconfig"
+      state: link
+      force: true
+      follow: false
+    vars:
+      gitconfig_mapping:
+        mennos-desktop: "$DOTFILES_PATH/config/git/gitconfig.wsl"
+        mennos-laptop-w: "$DOTFILES_PATH/config/git/gitconfig.wsl"
+        mennos-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
+        mennos-cloud-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
+        mennos-vm: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
+        dotfiles-test: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
+  tags:
+    - symlinks
\ No newline at end of file