diff --git a/.drone.yml b/.drone.yml
index 0b8816a..a4d61e2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -30,7 +30,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:
@@ -40,7 +40,7 @@ steps:
   - verify
 
 - name: tags
-  image: xoxys/docker-autotag
+  image: thegeeklab/docker-autotag
   environment:
     DOCKER_AUTOTAG_FORCE_LATEST: True
     DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
@@ -59,7 +59,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:
@@ -121,7 +121,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
@@ -168,6 +168,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: c2586bb0f6a5a5c4534d7fe2d9ed1170385e1d0a5abd32819e19d5388a3e68eb
+hmac: b6c2ea029f978af3d1699d2415092e7dcde2ccccaecc7b7adbdb24a5101fb4c8
 
 ...
diff --git a/Dockerfile b/Dockerfile
index 178ecfe..8f19403 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" \
diff --git a/README.md b/README.md
index 9d28082..00d5fe4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ bitwardenrs
 Rootless Bitwarden RS - Self-hosted password manager
 
 [![Build Status](https://img.shields.io/drone/build/docker/bitwardenrs?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/bitwardenrs)
-[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/xoxys/bitwardenrs)
+[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/bitwardenrs)
 [![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/bitwardenrs)
 [![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/bitwardenrs)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/bitwardenrs/src/branch/master/LICENSE)
@@ -33,7 +33,7 @@ services:
 
   bitwardenrs:
     container_name: bitwardenrs
-    image: xoxys/bitwardenrs:latest
+    image: thegeeklab/bitwardenrs:latest
     depends_on:
       - postgres
     ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index 025219e..6089455 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
 
   bitwardenrs:
     container_name: bitwardenrs
-    image: xoxys/bitwardenrs:latest
+    image: thegeeklab/bitwardenrs:latest
     depends_on:
       - postgres
     ports: