diff --git a/pom.xml b/pom.xml
index 22076aa..2f1fad9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,12 +80,6 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <!-- Mail -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-
         <!-- Security -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/sample.env.development b/sample.env.development
index 8c34289..b295eff 100644
--- a/sample.env.development
+++ b/sample.env.development
@@ -1,9 +1,4 @@
 ARCHIPIO_TEMPLATE_SERVICE_DB_URL=
 ARCHIPIO_TEMPLATE_SERVICE_DB_NAME=
 ARCHIPIO_TEMPLATE_SERVICE_DB_TEMPLATE=
-ARCHIPIO_TEMPLATE_SERVICE_DB_PASSWORD=
-
-ARCHIPIO_TEMPLATE_SERVICE_MAIL_HOST=
-ARCHIPIO_TEMPLATE_SERVICE_MAIL_PORT=
-ARCHIPIO_TEMPLATE_SERVICE_MAIL_USERNAME=
-ARCHIPIO_TEMPLATE_SERVICE_MAIL_PASSWORD=
\ No newline at end of file
+ARCHIPIO_TEMPLATE_SERVICE_DB_PASSWORD=
\ No newline at end of file
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 16d99dc..30cfc90 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 18081
+  port: 18083
 spring:
   application:
     name: template-service
@@ -15,15 +15,4 @@ spring:
   jpa:
     show-sql: true
     hibernate:
-      ddl-auto: validate
-  mail:
-    protocol: smtps
-    host: ${ARCHIPIO_TEMPLATE_SERVICE_MAIL_HOST}
-    port: ${ARCHIPIO_TEMPLATE_SERVICE_MAIL_PORT}
-    username: ${ARCHIPIO_TEMPLATE_SERVICE_MAIL_USERNAME}
-    password: ${ARCHIPIO_TEMPLATE_SERVICE_MAIL_PASSWORD}
-    test-connection: true
-    properties:
-      mail.smtp.auth: true
-      mail.smtp.starttls.enable: true
-      mail.smtp.ssl.enable: true
\ No newline at end of file
+      ddl-auto: validate
\ No newline at end of file