diff --git a/.drone.jsonnet b/.drone.jsonnet
index eb8a217..10761ae 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -8,7 +8,7 @@ local PipelineLinting = {
   steps: [
     {
       name: 'ansible-later',
-      image: 'xoxys/ansible-later',
+      image: 'thegeeklab/ansible-later',
       commands: [
         'ansible-later',
       ],
@@ -36,7 +36,7 @@ local PipelineDeployment(scenario='centos7') = {
   steps: [
     {
       name: 'ansible-molecule',
-      image: 'xoxys/molecule:3',
+      image: 'thegeeklab/molecule:3',
       environment: {
         DO_API_KEY: { from_secret: 'do_api_key' },
       },
@@ -63,7 +63,7 @@ local PipelineDocumentation = {
   steps: [
     {
       name: 'generate',
-      image: 'xoxys/ansible-doctor',
+      image: 'thegeeklab/ansible-doctor',
       environment: {
         ANSIBLE_DOCTOR_LOG_LEVEL: 'INFO',
         ANSIBLE_DOCTOR_FORCE_OVERWRITE: true,
diff --git a/.drone.yml b/.drone.yml
index 2de56fd..64e89af 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ platform:
 
 steps:
 - name: ansible-later
-  image: xoxys/ansible-later
+  image: thegeeklab/ansible-later
   commands:
   - ansible-later
 
@@ -35,7 +35,7 @@ workspace:
 
 steps:
 - name: ansible-molecule
-  image: xoxys/molecule:3
+  image: thegeeklab/molecule:3
   commands:
   - molecule test -s centos7
   environment:
@@ -60,7 +60,7 @@ platform:
 
 steps:
 - name: generate
-  image: xoxys/ansible-doctor
+  image: thegeeklab/ansible-doctor
   environment:
     ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/
     ANSIBLE_DOCTOR_FORCE_OVERWRITE: true
@@ -144,6 +144,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 9bf0b01a1ef62aad53113a55d1346c03a362e0808dcd71a7634a5a3865f83282
+hmac: 71459802189135f671fc9783703ef46eee2b7c80402fa25b687dc8d63913ddb4
 
 ...
diff --git a/vars/main.yml b/vars/main.yml
index ed61087..ce2b19a 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,5 +1,5 @@
 ---
-__cups_download_url: https://gitea.rknet.org/xoxys/cups-rpm/releases/download/v{{ cups_version }}
+__cups_download_url: https://gitea.rknet.org/thegeeklab/cups-rpm/releases/download/v{{ cups_version }}
 __cups_packages:
   - "{{ __cups_download_url }}/cups-{{ cups_version }}-0.x86_64.rpm"
   - "{{ __cups_download_url }}/cups-devel-{{ cups_version }}-0.x86_64.rpm"