diff --git a/.github/workflows/prepare-action/action.yml b/.github/workflows/prepare-action/action.yml
index ee537d7..261bc55 100644
--- a/.github/workflows/prepare-action/action.yml
+++ b/.github/workflows/prepare-action/action.yml
@@ -23,4 +23,4 @@ runs:
     - name: "Install dependencies via pipenv."
       run: "pipenv install --dev"
       shell: "bash"
-      working-directory: "ansible_collections/hifis/software_services"
+      working-directory: "ansible_collections/hifis/toolkit"
diff --git a/.github/workflows/unattended_upgrades.yml b/.github/workflows/unattended_upgrades.yml
index 90fd559..f31bdbd 100644
--- a/.github/workflows/unattended_upgrades.yml
+++ b/.github/workflows/unattended_upgrades.yml
@@ -50,10 +50,10 @@ jobs:
       - name: "Check out the codebase."
         uses: "actions/checkout@v4"
         with:
-          path: "ansible_collections/hifis/software_services"
+          path: "ansible_collections/hifis/toolkit"
 
       - name: "Prepare the job environment."
-        uses: "./ansible_collections/hifis/software_services/.github/workflows/prepare-action"
+        uses: "./ansible_collections/hifis/toolkit/.github/workflows/prepare-action"
 
       - name: "Install modern podman"
         run: |
@@ -72,4 +72,4 @@ jobs:
         run: "pipenv run molecule test -s unattended_upgrades"
         env:
           MOLECULE_IMAGE: "${{ matrix.image }}"
-        working-directory: "ansible_collections/hifis/software_services"
+        working-directory: "ansible_collections/hifis/toolkit"
diff --git a/.github/workflows/zammad.yml b/.github/workflows/zammad.yml
index 514b34b..318c84b 100644
--- a/.github/workflows/zammad.yml
+++ b/.github/workflows/zammad.yml
@@ -46,16 +46,16 @@ jobs:
       - name: "Check out the codebase."
         uses: "actions/checkout@v4"
         with:
-          path: "ansible_collections/hifis/software_services"
+          path: "ansible_collections/hifis/toolkit"
 
       - name: "Prepare the job environment."
-        uses: "./ansible_collections/hifis/software_services/.github/workflows/prepare-action"
+        uses: "./ansible_collections/hifis/toolkit/.github/workflows/prepare-action"
 
       # https://github.com/ansible/molecule/issues/3806
       - name: "Help molecule to find the dependencies"
         run: |
           mkdir -p /home/runner/.ansible
-          ln -s /home/runner/work/ansible-role-unattended-upgrades/ansible-role-unattended-upgrades/ansible_collections/hifis/software_services/roles \
+          ln -s /home/runner/work/ansible-role-unattended-upgrades/ansible-role-unattended-upgrades/ansible_collections/hifis/toolkit/roles \
             /home/runner/.ansible/roles
 
       - name: "Install modern podman"
@@ -75,4 +75,4 @@ jobs:
         run: "XDG_RUNTIME_DIR=/run/user/$UID pipenv run molecule test -s zammad"
         env:
           MOLECULE_IMAGE: "${{ matrix.image }}"
-        working-directory: "ansible_collections/hifis/software_services"
+        working-directory: "ansible_collections/hifis/toolkit"
diff --git a/README.md b/README.md
index 0557203..31a41ed 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
 SPDX-License-Identifier: Apache-2.0
 -->
 
-# Ansible Collection - hifis.software_services
+# Ansible Collection - hifis.toolkit
 
 [![Latest release](https://img.shields.io/github/v/release/hifis-net/ansible-role-unattended-upgrades)](https://github.com/hifis-net/ansible-role-unattended-upgrades/releases)
 [![hifis.unattended_upgrades](https://github.com/hifis-net/ansible-role-unattended-upgrades/actions/workflows/unattended_upgrades.yml/badge.svg)](https://github.com/hifis-net/ansible-role-unattended-upgrades/actions/workflows/unattended_upgrades.yml)
@@ -39,7 +39,7 @@ software engineers, but not exclusively. The following use cases are supported:
 Install the collection via ansible-galaxy:
 
 ```shell
-ansible-galaxy collection install hifis.software_services
+ansible-galaxy collection install hifis.toolkit
 ```
 
 ## License
diff --git a/galaxy.yml b/galaxy.yml
index 4136241..5a5f9a2 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 namespace: 'hifis'
-name: 'software_services'
+name: 'toolkit'
 version: '4.0.0'
 readme: 'README.md'
 authors:
diff --git a/molecule/unattended_upgrades/converge.yml b/molecule/unattended_upgrades/converge.yml
index 0cef8ba..90cb4e3 100644
--- a/molecule/unattended_upgrades/converge.yml
+++ b/molecule/unattended_upgrades/converge.yml
@@ -10,6 +10,6 @@
   tasks:
     - name: "Include unattended_upgrades role"
       ansible.builtin.include_role:
-        name: "hifis.software_services.unattended_upgrades"
+        name: "hifis.toolkit.unattended_upgrades"
 
 ...
diff --git a/molecule/zammad/converge.yml b/molecule/zammad/converge.yml
index 3ba5c6d..9a60aed 100644
--- a/molecule/zammad/converge.yml
+++ b/molecule/zammad/converge.yml
@@ -27,4 +27,4 @@
 
     - name: "Include ansible-role-zammad"
       ansible.builtin.include_role:
-        name: "hifis.software_services.zammad"
+        name: "hifis.toolkit.zammad"
diff --git a/roles/unattended_upgrades/README.md b/roles/unattended_upgrades/README.md
index 2549494..8e2bbfe 100644
--- a/roles/unattended_upgrades/README.md
+++ b/roles/unattended_upgrades/README.md
@@ -210,7 +210,7 @@ Example for Ubuntu, with custom [origins patterns](#patterns-examples), blacklis
 ```yaml
 - hosts: all
   roles:
-  - role: hifis.software_services.unattended_upgrades
+  - role: hifis.toolkit.unattended_upgrades
     unattended_origins_patterns:
     - 'origin=Ubuntu,archive=${distro_codename}-security'
     - 'o=Ubuntu,a=${distro_codename}-updates'
@@ -229,7 +229,7 @@ systems. You can [use `when` conditional with role](https://docs.ansible.com/ans
 ```yaml
 - hosts: all
   roles:
-     - role: hifis.software_services.unattended_upgrades
+     - role: hifis.toolkit.unattended_upgrades
        when: ansible_facts['os_family'] == 'Debian'
 ```
 
diff --git a/roles/zammad/README.md b/roles/zammad/README.md
index adab7ce..e440ad5 100644
--- a/roles/zammad/README.md
+++ b/roles/zammad/README.md
@@ -131,7 +131,7 @@ This role has been successfully tested together with the following roles:
 ```yaml
     - hosts: servers
       roles:
-         - role: hifis.software_services.zammad
+         - role: hifis.toolkit.zammad
            become: yes
 ```