diff --git a/Configure-SSL.md b/Configure-SSL.md
index 3f2ae27..65008ef 100644
--- a/Configure-SSL.md
+++ b/Configure-SSL.md
@@ -162,7 +162,7 @@ The second part of the setup is the actual mail container. So, in another folder
 version: '2'
 services:
   mail:
-    image: tvial/docker-mailserver:latest
+    image: docker.io/mailserver/docker-mailserver:latest
     hostname: ${HOSTNAME}
     domainname: ${DOMAINNAME}
     container_name: ${CONTAINER_NAME}
@@ -347,7 +347,7 @@ This allows for support of wild card certificates: `"SSL_DOMAIN=*.example.com"`.
 version: '3.8'
 services:
   mail:
-    image: tvial/docker-mailserver:stable
+    image: docker.io/mailserver/docker-mailserver:stable
     hostname: mail
     domainname: example.com
     volumes:
@@ -397,7 +397,7 @@ Documentation: https://github.com/youtous/docker-mailserver-traefik
 
 You can easily generate a self-signed SSL certificate by using the following command:
 
-    docker run -ti --rm -v "$(pwd)"/config/ssl:/tmp/docker-mailserver/ssl -h mail.my-domain.com -t tvial/docker-mailserver generate-ssl-certificate
+    docker run -ti --rm -v "$(pwd)"/config/ssl:/tmp/docker-mailserver/ssl -h mail.my-domain.com -t docker.io/mailserver/docker-mailserver generate-ssl-certificate
 
     # Press enter
     # Enter a password when needed