diff --git a/.github/actions/docker-common/action.yml b/.github/actions/docker-common/action.yml
index 317bfc8..962dd5b 100644
--- a/.github/actions/docker-common/action.yml
+++ b/.github/actions/docker-common/action.yml
@@ -64,8 +64,8 @@ runs:
         flavor: |
           latest=false
         images: |
-          khalibre/privacyidea
-          ghcr.io/Khalibre/privacyidea
+          kheeklab/privacyidea
+          ghcr.io/kheeklab/privacyidea
         tags: |
           type=semver,pattern={{major}}.{{minor}}.{{patch}},enable=${{ github.event_name == 'push' && inputs.is_default_version && github.ref_type == 'tag' }}
           type=raw,value={{tag}}-python-${{ inputs.python_base_image }},enable=${{ github.event_name == 'push' && github.ref_type == 'tag' }}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 69aef7a..eef0d35 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-infrastructure[at]khalibre.com.
+contact[at]kheek.com.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
diff --git a/Dockerfile b/Dockerfile
index fb99839..25bf442 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN python3 -m venv "$PI_HOME" && . "$PI_HOME/bin/activate" \
 
 FROM python:$BASE_IMAGE_TAG
 ARG PI_HOME
-LABEL maintainer="Sida Say <sida.say@khalibre.com>"
+LABEL maintainer="Sida Say <sida@kheek.com>"
 ENV PI_SKIP_BOOTSTRAP=false \
     PI_DB_VENDOR=sqlite \
     PI_DATA_DIR=/data/privacyidea \
diff --git a/README.md b/README.md
index b7e555e..8cb2312 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # PrivacyIDEA Docker Image
 
-![main workflow](https://github.com/Khalibre/privacyidea-docker/actions/workflows/release.yml/badge.svg) ![GitHub](https://img.shields.io/github/license/Khalibre/privacyidea-docker) ![Docker Pulls](https://img.shields.io/docker/pulls/khalibre/privacyidea) ![GitHub Repo stars](https://img.shields.io/github/stars/Khalibre/privacyidea-docker)
+![main workflow](https://github.com/kheeklab/privacyidea-docker/actions/workflows/release.yml/badge.svg) ![GitHub](https://img.shields.io/github/license/kheeklab/privacyidea-docker) ![Docker Pulls](https://img.shields.io/docker/pulls/kheeklab/privacyidea) ![GitHub Repo stars](https://img.shields.io/github/stars/kheeklab/privacyidea-docker)
 
 This is a build environment to build a docker image for privacyIDEA based on [official Python image](https://hub.docker.com/_/python) and [PrivacyIDEA](https://github.com/privacyidea/privacyidea)
 
@@ -12,14 +12,14 @@ This is a build environment to build a docker image for privacyIDEA based on [of
 The docker image is a self-contained Debian with privacyIDEA installed, which will run on every distribution.
 
 > [!NOTE]
-> **Disclaimer**: The respective trademarks mentioned in the offering are owned by the respective companies. We do not provide a commercial license for any of these products. This listing has an open-source license. privacyIDEA is run and maintained by NetKnights, which is a complete and separate project from Khalibre.
+> **Disclaimer**: The respective trademarks mentioned in the offering are owned by the respective companies. We do not provide a commercial license for any of these products. This listing has an open-source license. privacyIDEA is run and maintained by NetKnights, which is a complete and separate project from kheeklab.
 
 ### Registry
 
 The image is stored in bellow registries:
 
-- [Docker Hub](https://hub.docker.com/r/khalibre/privacyidea)
-- [GitHub Container Registry](https://github.com/Khalibre/privacyidea-docker/pkgs/container/privacyidea)
+- [Docker Hub](https://hub.docker.com/r/kheeklab/privacyidea)
+- [GitHub Container Registry](https://github.com/kheeklab/privacyidea-docker/pkgs/container/privacyidea)
 
 ### Tags
 
@@ -67,7 +67,7 @@ Login to <http://localhost> with **admin/privacyidea**
 
 ### Admin credentials
 
-The Khalibre privacyIDEA container can create a default admin user by setting the following environment variables:
+The kheeklab privacyIDEA container can create a default admin user by setting the following environment variables:
 
 - `PI_ADMIN_USER`: Administrator default user. Default: **admin**.
 - `PI_ADMIN_PASSWORD`:  Administrator default password. Default: **privacyidea**
@@ -201,10 +201,10 @@ We'd love for you to contribute to this container. You can request new features
 
 ## Star History
 
-<a href="https://star-history.com/#Khalibre/privacyidea-docker&Date">
+<a href="https://star-history.com/#kheeklab/privacyidea-docker&Date">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=Khalibre/privacyidea-docker&type=Date&theme=dark" />
-    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=Khalibre/privacyidea-docker&type=Date" />
-    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=Khalibre/privacyidea-docker&type=Date" />
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=kheeklab/privacyidea-docker&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=kheeklab/privacyidea-docker&type=Date" />
+    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=kheeklab/privacyidea-docker&type=Date" />
   </picture>
 </a>
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index 363e725..8545403 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - MARIADB_USER=privacyidea
       - MARIADB_PASSWORD=privacyidea@123
   pi:
-    image: 'khalibre/privacyidea:dev'
+    image: 'kheeklab/privacyidea:dev'
     ports:
       - '8080:8080'
     environment: