diff --git a/.env-core/templates/wordpress/.env.example b/.env-core/templates/wordpress/.env.example
index 1c1fb89..c19f1cd 100644
--- a/.env-core/templates/wordpress/.env.example
+++ b/.env-core/templates/wordpress/.env.example
@@ -39,6 +39,20 @@ PMA_PORT=3306
 PMA_USER="${MYSQL_ROOT_USER}"
 PMA_PASSWORD="${MYSQL_ROOT_PASSWORD}"
 
+
+#--------------------------------------------------------------------------------------------------#
+#                                   SMTP SETTINGS                                                  #
+#--------------------------------------------------------------------------------------------------#
+SMTP_HOST={DOMAIN_FULL}-mail
+SMTP_PORT=1025
+SMTP_USER=null
+SMTP_PASSWORD=null
+SMTP_FROM='no-reply@example.com'
+SMTP_FROM_NAME='WordPress'
+SMTP_VIRTUAL_HOST={DOMAIN_FULL}.mail
+SMTP_AUTH=0
+SMTP_SECURE=0
+
 #--------------------------------------------------------------------------------------------------#
 #                                          HOME PAGE URL                                           #
 # Optional, but If not set current server name will be used, e.g. http://www.example.com           #
@@ -154,4 +168,4 @@ WP_MAX_MEMORY_LIMIT=512M
 #--------------------------------------------------------------------------------------------------#
 #                                          MISCELLANEOUS                                           #
 #--------------------------------------------------------------------------------------------------#
-WP_DEFAULT_THEME=twentytwentyone
\ No newline at end of file
+WP_DEFAULT_THEME=twentytwentyone
diff --git a/.env-core/templates/wordpress/docker-compose.override.yml b/.env-core/templates/wordpress/docker-compose.override.yml
index c57d496..f99b06f 100644
--- a/.env-core/templates/wordpress/docker-compose.override.yml
+++ b/.env-core/templates/wordpress/docker-compose.override.yml
@@ -19,11 +19,22 @@ services:
       - PMA_PORT=${PMA_PORT}
       - PMA_USER=${PMA_USER}
       - PMA_PASSWORD=${PMA_PASSWORD}
+    restart: always
+    volumes:
+      # Configs
+      - ./../wp-docker/phpmyadmin.ini:/usr/local/etc/php/conf.d/phpmyadmin.ini
+
+  #######################################
+  # Mailhog
+  #######################################
+  {DOMAIN_NAME}-mail:
+    image: mailhog/mailhog
+    environment:
+      - VIRTUAL_PORT=8025
+      - VIRTUAL_HOST=${SMTP_VIRTUAL_HOST}
+    restart: always
 
 networks:
   default:
     name: dockerwp
     external: true
-
-volumes:
-  {DOMAIN_NAME}_db_data:
diff --git a/.env-core/templates/wordpress/docker-compose.yml b/.env-core/templates/wordpress/docker-compose.yml
index eba0394..6bd037b 100644
--- a/.env-core/templates/wordpress/docker-compose.yml
+++ b/.env-core/templates/wordpress/docker-compose.yml
@@ -56,30 +56,6 @@ services:
     # Set max_allowed_packet to 256M (or any other value)
     command: ['--max_allowed_packet=32505856']
 
-  #######################################
-  # phpMyAdmin
-  #######################################
-  {DOMAIN_NAME}-phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    container_name: {DOMAIN_NAME}-phpmyadmin
-    depends_on:
-      - {DOMAIN_NAME}-mysql
-    links:
-      - {DOMAIN_NAME}-mysql
-    environment:
-      - VIRTUAL_PORT=80
-      - VIRTUAL_HOST=${PMA_VIRTUAL_HOST}
-      - PMA_ABSOLUTE_URI=${PMA_ABSOLUTE_URI}
-      - PMA_ARBITRARY=${PMA_ARBITRARY}
-      - PMA_HOST=${PMA_HOST}
-      - PMA_PORT=${PMA_PORT}
-      - PMA_USER=${PMA_USER}
-      - PMA_PASSWORD=${PMA_PASSWORD}
-    restart: always
-    volumes:
-      # Configs
-      - ./../wp-docker/phpmyadmin.ini:/usr/local/etc/php/conf.d/phpmyadmin.ini
-
 networks:
   default:
     name: dockerwp