diff --git a/parent-compose.yml b/parent-compose.yml
index bf50606..a070c23 100644
--- a/parent-compose.yml
+++ b/parent-compose.yml
@@ -2,4 +2,4 @@ version: '3.5'
 services:
   tdk:
     container_name: tdk
-    image: synthesizedio/synthesized-tdk-cli:v1.53.0
+    image: synthesizedio/synthesized-tdk-cli:v1.58.0
diff --git a/postgres/docker-compose.yaml b/postgres/docker-compose.yaml
index 3cb13ed..1c08416 100644
--- a/postgres/docker-compose.yaml
+++ b/postgres/docker-compose.yaml
@@ -52,7 +52,7 @@ services:
 
   databases:
     container_name: databases
-    image: docker/whalesay
+    image: synthesizedio/whalesay
     command: >
       cowsay
         "Both databases have been started and are ready for TDK exercises!"