diff --git a/.drone.yml b/.drone.yml
index a3c3ab1..d6ea5db 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -21,7 +21,7 @@ steps:
     dry_run: true
     password:
       from_secret: docker_password
-    repo: xoxys/${DRONE_REPO_NAME}
+    repo: thegeeklab/${DRONE_REPO_NAME}
     username:
       from_secret: docker_username
   when:
@@ -31,7 +31,7 @@ steps:
   - binary
 
 - name: tags
-  image: xoxys/docker-autotag
+  image: thegeeklab/docker-autotag
   environment:
     DOCKER_AUTOTAG_FORCE_LATEST: True
     DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
@@ -50,7 +50,7 @@ steps:
     dockerfile: Dockerfile
     password:
       from_secret: docker_password
-    repo: xoxys/${DRONE_REPO_NAME}
+    repo: thegeeklab/${DRONE_REPO_NAME}
     username:
       from_secret: docker_username
   when:
@@ -112,7 +112,7 @@ steps:
       from_secret: docker_username
     PUSHRM_FILE: README.md
     PUSHRM_SHORT: Rootless Bitwarden_RS - Self-hosted password manager
-    PUSHRM_TARGET: xoxys/${DRONE_REPO_NAME}
+    PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
   when:
     status:
     - success
@@ -159,6 +159,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: d50573e3b9c2a5bddd44c10b015e520fffff09919bf81551cdd3681e3172b4d1
+hmac: cc8a074c830055ba5b1da1d6238a9f56547502624dfe50e8596be791597649b2
 
 ...
diff --git a/Dockerfile b/Dockerfile
index cf136c1..68e67a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM xoxys/alpine
+FROM thegeeklab/alpine
 
 LABEL maintainer="Robert Kaussow <mail@geeklabor.de>" \
     org.label-schema.name="bitwardenrs_ldap" \
diff --git a/README.md b/README.md
index 8a603b5..9319de1 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Rootless Bitwarden_RS - Self-hosted password manager
 
 [![Build Status](https://img.shields.io/drone/build/docker/bitwardenrs_ldap?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/bitwardenrs_ldap)
-[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/xoxys/bitwardenrs_ldap)
+[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/bitwardenrs_ldap)
 [![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/bitwardenrs_ldap)
 [![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/bitwardenrs_ldap)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/bitwardenrs_ldap/src/branch/master/LICENSE)
@@ -33,7 +33,7 @@ services:
 
   bitwardenrs:
     container_name: bitwardenrs_server
-    image: xoxys/bitwardenrs:latest
+    image: thegeeklab/bitwardenrs:latest
     depends_on:
       - postgres
     ports:
@@ -47,7 +47,7 @@ services:
   bitwardenrs_ldap:
     container_name: ldap_sync
     restart: always
-    image: xoxys/bitwardenrs_ldap:latest
+    image: thegeeklab/bitwardenrs_ldap:latest
     depends_on:
       - bitwardenrs
       - ldap
diff --git a/docker-compose.yml b/docker-compose.yml
index 4936068..8b349be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
 
   bitwardenrs:
     container_name: bitwardenrs_server
-    image: xoxys/bitwardenrs:latest
+    image: thegeeklab/bitwardenrs:latest
     depends_on:
       - postgres
     ports:
@@ -30,7 +30,7 @@ services:
   bitwardenrs_ldap:
     container_name: ldap_sync
     restart: always
-    image: xoxys/bitwardenrs_ldap:latest
+    image: thegeeklab/bitwardenrs_ldap:latest
     depends_on:
       - bitwardenrs
       - ldap