diff --git a/roles/client-ssh/meta/main.yml b/roles/client-ssh/meta/main.yml
index 09b73325..69ea9861 100644
--- a/roles/client-ssh/meta/main.yml
+++ b/roles/client-ssh/meta/main.yml
@@ -26,4 +26,5 @@ galaxy_info:
   documentation: https://s.veen.world/cymais
 
 dependencies:
-  - client-git
\ No newline at end of file
+  - client-git
+  - shell
\ No newline at end of file
diff --git a/roles/client-ssh/tasks/main.yml b/roles/client-ssh/tasks/main.yml
index 0509ab28..52ad1a04 100644
--- a/roles/client-ssh/tasks/main.yml
+++ b/roles/client-ssh/tasks/main.yml
@@ -35,21 +35,11 @@
     daemon_reload: true
   become: false
 
-- name: Set SSH_AUTH_SOCK in bash_profile or profile
-  block:
-    - name: Choose profile file
-      set_fact:
-        profile_file: "$HOME/.bash_profile"
-      when: ansible_facts.env.HOME is defined and lookup('file', ansible_env.HOME + '/.bash_profile', errors='ignore') is defined
-
-    - name: Fallback to .profile if .bash_profile not found
-      set_fact:
-        profile_file: "$HOME/.profile"
-      when: profile_file is not defined
-
-    - name: Ensure SSH_AUTH_SOCK is set in profile
-      lineinfile:
-        path: "{{ profile_file }}"
-        line: 'export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"'
-        insertafter: EOF
-        state: present
+- name: Ensure ~/.profile exists with common environment
+  lineinfile:
+    path: "{{ ansible_env.HOME }}/.profile"
+    line: 'export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"'
+    insertafter: EOF
+    state: present
+    create: yes
+    mode: "0644"
\ No newline at end of file
diff --git a/roles/shell/README.md b/roles/shell/README.md
new file mode 100644
index 00000000..491e8251
--- /dev/null
+++ b/roles/shell/README.md
@@ -0,0 +1,27 @@
+# Shell 🐚
+
+## Description
+
+This Ansible role ensures that [.profile](https://en.wikipedia.org/wiki/Bourne_shell#Startup_scripts) is sourced in both [Bash](https://www.gnu.org/software/bash/) and [Zsh](https://www.zsh.org/) environments. It enables consistent environment variable loading across different login shells by linking shell-specific profile files (`.bash_profile`, `.zprofile`) to a centralized `.profile`.
+
+## Overview
+
+By standardizing `.profile` as the central source for environment configuration, this role ensures consistent shell behavior. It does **not** manage the contents of `.profile` itself — only guarantees that it is sourced by supported shells.
+
+## Purpose
+
+The purpose of this role is to unify shell environment setup across Bash and Zsh. It minimizes duplication and confusion by encouraging the use of `.profile` for shared configuration such as environment variables and agent settings.
+
+## Features
+
+- **Centralized Configuration:** Promotes `.profile` as the single source for shared shell settings.
+- **Cross-Shell Compatibility:** Ensures both Bash and Zsh source `.profile` properly.
+- **Non-Invasive:** Does not alter the content of `.profile`.
+
+## Credits 📝
+
+Developed and maintained by **Kevin Veen-Birkenbach**.  
+Learn more at [www.veen.world](https://www.veen.world)
+
+Part of the [CyMaIS Project](https://github.com/kevinveenbirkenbach/cymais)  
+License: [CyMaIS NonCommercial License (CNCL)](https://s.veen.world/cncl)
diff --git a/roles/shell/meta/main.yml b/roles/shell/meta/main.yml
new file mode 100644
index 00000000..d28f8888
--- /dev/null
+++ b/roles/shell/meta/main.yml
@@ -0,0 +1,32 @@
+---
+galaxy_info:
+  author: "Kevin Veen-Birkenbach"
+  description: "Ensures that .profile is sourced in all shells."
+  license: "CyMaIS NonCommercial License (CNCL)"
+  license_url: "https://s.veen.world/cncl"
+  company: | 
+    Kevin Veen-Birkenbach
+    Consulting & Coaching Solutions
+    https://www.veen.world
+  min_ansible_version: "2.9"
+  platforms:
+    - name: Archlinux
+      versions:
+        - rolling
+    - name: Debian
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - all
+  galaxy_tags:
+    - shell
+    - bash
+    - zsh
+    - environment
+    - profile
+    - dotfiles
+  repository: https://s.veen.world/cymais
+  issue_tracker_url: https://s.veen.world/cymaisissues
+  documentation: https://s.veen.world/cymais
+dependencies: []
diff --git a/roles/shell/tasks/main.yml b/roles/shell/tasks/main.yml
new file mode 100644
index 00000000..18b15514
--- /dev/null
+++ b/roles/shell/tasks/main.yml
@@ -0,0 +1,20 @@
+---
+# roles/shell/tasks/main.yml
+
+- name: Ensure ~/.bash_profile sources ~/.profile
+  lineinfile:
+    path: "{{ ansible_env.HOME }}/.bash_profile"
+    line: '[ -f ~/.profile ] && . ~/.profile'
+    insertafter: EOF
+    state: present
+    create: yes
+    mode: "0644"
+
+- name: Ensure ~/.zprofile sources ~/.profile
+  lineinfile:
+    path: "{{ ansible_env.HOME }}/.zprofile"
+    line: '[ -f ~/.profile ] && . ~/.profile'
+    insertafter: EOF
+    state: present
+    create: yes
+    mode: "0644"