diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
index 47759b1..737a7c8 100644
--- a/ansible/inventory/group_vars/all.yml
+++ b/ansible/inventory/group_vars/all.yml
@@ -62,6 +62,8 @@ ai_agents_npm_packages:
   - name: "@google/gemini-cli"
     state: latest
 
+ai_agents_enabled: true
+
 ai_agents_dotfiles:
   - name: AI common config
     src: .config/ai
diff --git a/ansible/inventory/group_vars/server.yml b/ansible/inventory/group_vars/server.yml
index 146d9bb..2350796 100644
--- a/ansible/inventory/group_vars/server.yml
+++ b/ansible/inventory/group_vars/server.yml
@@ -6,6 +6,7 @@ effective_username: "{{ server_username }}"
 effective_user_group: "{{ server_user_group }}"
 effective_user_home: "{{ server_user_home }}"
 server_container_stack_dir: /opt/docker/server
+ai_agents_enabled: false
 
 profile_packages:
   - avahi-daemon
diff --git a/ansible/roles/dotfiles_common/tasks/main.yml b/ansible/roles/dotfiles_common/tasks/main.yml
index 5759209..b549fd5 100644
--- a/ansible/roles/dotfiles_common/tasks/main.yml
+++ b/ansible/roles/dotfiles_common/tasks/main.yml
@@ -33,7 +33,11 @@
     owner: "{{ effective_username }}"
     group: "{{ effective_user_group }}"
     mode: "{{ item.mode }}"
-  loop: "{{ (common_dotfiles | default([])) + (ai_agents_dotfiles | default([])) }}"
+  loop: >-
+    {{
+      (common_dotfiles | default([]))
+      + ((ai_agents_dotfiles | default([])) if (ai_agents_enabled | default(false)) else [])
+    }}
   loop_control:
     label: "{{ item.dest }}"
 
@@ -47,7 +51,9 @@
     mode: "0755"
   loop:
     - .codex
-  when: (ai_agents_templates | default([])) | length > 0
+  when:
+    - ai_agents_enabled | default(false)
+    - (ai_agents_templates | default([])) | length > 0
 
 - name: Render AI agent templates
   tags: [dotfiles, dotfiles:common]
@@ -60,6 +66,7 @@
   loop: "{{ ai_agents_templates | default([]) }}"
   loop_control:
     label: "{{ item.dest }}"
+  when: ai_agents_enabled | default(false)
 
 - name: Refresh bat cache
   tags: [dotfiles, dotfiles:common]