diff --git a/comfycamp.yml b/comfycamp.yml
index c38aeaf..8e47778 100644
--- a/comfycamp.yml
+++ b/comfycamp.yml
@@ -5,3 +5,4 @@
       postgresql_password: "{{ postgresql_users.comfycamp }}"
       jwt_secret: "{{ comfycamp_jwt_secret }}"
       secret_key_base: "{{ comfycamp_secret_key_base }}"
+      smtp_password: "{{ mail_users['comfycamp@comfycamp.space'] }}"
diff --git a/roles/comfycamp/tasks/main.yml b/roles/comfycamp/tasks/main.yml
index a5f08c6..03b0dbb 100644
--- a/roles/comfycamp/tasks/main.yml
+++ b/roles/comfycamp/tasks/main.yml
@@ -5,7 +5,7 @@
     state: directory
     owner: root
     group: root
-    mode: 1770
+    mode: "1700"
 - name: Copy comfycamp config
   become: true
   ansible.builtin.template:
@@ -13,16 +13,14 @@
     dest: /etc/comfycamp/.env
     owner: root
     group: root
-    mode: '0660'
+    mode: "0600"
 - name: Create comfycamp container
   become: true
   community.docker.docker_container:
     name: comfycamp
-    image: git.comfycamp.space/lumin/comfycamp:v1.1.7
+    image: git.comfycamp.space/lumin/comfycamp:v1.1.16
     env_file: /etc/comfycamp/.env
     networks:
       - name: postgresql
       - name: haproxy
-    ports:
-      - 127.0.0.1:3006:4000
     restart_policy: unless-stopped
diff --git a/roles/comfycamp/templates/comfycamp.env b/roles/comfycamp/templates/comfycamp.env
index 390c2bc..52ea2ba 100644
--- a/roles/comfycamp/templates/comfycamp.env
+++ b/roles/comfycamp/templates/comfycamp.env
@@ -2,9 +2,8 @@ PHX_HOST=comfycamp.space
 DATABASE_URL=postgres://{{ postgresql_user }}:{{ postgresql_password }}@postgresql:5432/comfycamp
 SECRET_KEY_BASE={{ secret_key_base }}
 SMTP_RELAY=comfycamp.space
-SMTP_USERNAME=admin@comfycamp.space
+SMTP_FROM=comfycamp@comfycamp.space
+SMTP_USERNAME=comfycamp@comfycamp.space
 SMTP_PASSWORD={{ smtp_password }}
-SMTP_SSL=true
-SMTP_TLS=always
-SMTP_PORT=465
+SMTP_PORT=587
 JWT_SECRET={{ jwt_secret }}
diff --git a/roles/mastodon/templates/mastodon.env.j2 b/roles/mastodon/templates/mastodon.env.j2
index 9dd5e78..8f19c0a 100644
--- a/roles/mastodon/templates/mastodon.env.j2
+++ b/roles/mastodon/templates/mastodon.env.j2
@@ -24,6 +24,7 @@ SMTP_PORT={{ smtp_port }}
 SMTP_LOGIN={{ smtp_login }}
 SMTP_PASSWORD={{ smtp_password }}
 SMTP_FROM_ADDRESS={{ smtp_from_address }}
+SMTP_TLS=true
 
 S3_ENABLED=true
 S3_ENDPOINT={{ s3_endpoint }}