diff --git a/.drone.jsonnet b/.drone.jsonnet
index 56c8e65..7f37819 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 f7088a6..823afee 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:
@@ -67,7 +67,7 @@ workspace:
 
 steps:
 - name: ansible-molecule
-  image: xoxys/molecule:3
+  image: thegeeklab/molecule:3
   commands:
   - molecule test -s centos8
   environment:
@@ -92,7 +92,7 @@ platform:
 
 steps:
 - name: generate
-  image: xoxys/ansible-doctor
+  image: thegeeklab/ansible-doctor
   environment:
     ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/
     ANSIBLE_DOCTOR_FORCE_OVERWRITE: true
@@ -177,6 +177,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: eaffdd0a0f1931e7e1875640febec3e06c1b2d86cc493a9f3443b264613566c2
+hmac: f1ffeb5547ac8a94b9d3e90f0eba5d9a3f16d9bfcb9f9d25ae5799c9eaefb561
 
 ...