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 d93c99e..f6e80a4 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: d38057ccf4313e642e4985631dd0fdde7bbeb70d650e1d8001d3922315e1d462
+hmac: ca41f062fc02ba3639ec8d21c7909de2db73de58283d2a81636779cc676e9db4
 
 ...
diff --git a/defaults/main.yml b/defaults/main.yml
index 245684b..2745156 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # @var dockertidy_image:description: Docker image to use.
-dockertidy_image: xoxys/docker-tidy:latest
+dockertidy_image: thegeeklab/docker-tidy:latest
 
 # @var dockertidy_interval:description: Interval for the systemd timer.
 dockertidy_interval: daily