diff --git a/docker-compose.yml b/docker-compose.yml
index 34a98fa..1e9a19a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ version : '2.2'
 services :
   nginx_proxy :
     container_name : nginx_proxy
-    image : "anatsam/azuracast_nginx_proxy:latest"
+    image : "anatsam/azuracast-nginx-proxy"
     ports :
       - '${AZURACAST_HTTP_PORT:-80}:80'
       - '${AZURACAST_HTTPS_PORT:-443}:443'
@@ -34,7 +34,7 @@ services :
 
   nginx_proxy_letsencrypt :
     container_name : nginx_proxy_letsencrypt
-    image : "anatsam/azuracast_nginx_proxy_letsencrypt:latest"
+    image : "anatsam/azuracast-nginx_proxy-letsencrypt"
     volumes_from :
       - nginx_proxy
     volumes :
@@ -48,7 +48,7 @@ services :
 
   web :
     container_name : azuracast_web
-    image : "anatsam/azuracast_web_v2:latest"
+    image : "anatsam/azuracast_web_v2"
     # Want to customize the HTTP/S ports? Follow the instructions here:
     # https://docs.azuracast.com/en/administration/docker#using-non-standard-ports
     ports :
@@ -91,7 +91,7 @@ services :
 
   mariadb :
     container_name : azuracast_mariadb
-    image : "anatsam/azuracast_db:latest"
+    image : "anatsam/azuracast-db"
     volumes :
       - db_data:/var/lib/mysql
     env_file : azuracast.env
@@ -102,7 +102,7 @@ services :
 
   redis :
     container_name : azuracast_redis
-    image : "anatsam/azuracast_redis:latest"
+    image : "anatsam/azuracast-redis"
     sysctls :
       net.core.somaxconn : 1024
     volumes :
@@ -114,7 +114,7 @@ services :
 
   stations :
     container_name : azuracast_stations
-    image : "anatsam/azuracast_radio:latest"
+    image : "anatsam/azuracast-radio"
     ports :
       # This default mapping is the outgoing and incoming ports for the first 50 stations.
       # You can override this port mapping in your own docker-compose.override.yml file.