diff --git a/dockerfiles/email-forwarder/Dockerfile b/dockerfiles/email/postfix/Dockerfile
similarity index 100%
rename from dockerfiles/email-forwarder/Dockerfile
rename to dockerfiles/email/postfix/Dockerfile
diff --git a/dockerfiles/email-forwarder/install.sh b/dockerfiles/email/postfix/install.sh
similarity index 100%
rename from dockerfiles/email-forwarder/install.sh
rename to dockerfiles/email/postfix/install.sh
diff --git a/unit-files/email-forwarder.service b/unit-files/postfix.service
similarity index 93%
rename from unit-files/email-forwarder.service
rename to unit-files/postfix.service
index 098b6f2b5a7e978f755b66d403a69ca102688686..3ccc0cbd919796bdb1a0c49ec0278d11ba0bdcd9 100644
--- a/unit-files/email-forwarder.service
+++ b/unit-files/postfix.service
@@ -18,7 +18,7 @@ ExecStart=/usr/bin/docker run \
   --name %p \
   -v /data/runtime/postfix/:/data \
   -p 25:25 \
-  pierreozoux/email-forwarder
+  pierreozoux/postfix
 ExecReload=/usr/bin/docker restart %p
 ExecStop=/usr/bin/docker stop %p