diff --git a/.env.sample b/.env.sample
index c1ef84a..7d9723e 100644
--- a/.env.sample
+++ b/.env.sample
@@ -7,7 +7,7 @@ DOMAIN=vikunja.example.com
 
 LETS_ENCRYPT_ENV=production
 
-SECRET_DB_PASSWORD_VERSION=V1
+SECRET_DB_PASSWORD_VERSION=v1
 SECRET_JWT_SECRET_VERSION=v1
 
 LOG_LEVEL=INFO
@@ -21,7 +21,7 @@ COMPOSE_FILE=compose.yml
 # OAUTH_NAME
 # OAUTH_URL
 # OAUTH_CLIENT_ID
-# SECRET_OAUTH_SECRET_VERSION=V1
+# SECRET_OAUTH_SECRET_VERSION=v1
 
 # E-MAIL
 # COMPOSE_FILE="${COMPOSE_FILE}:compose.smtp.yml"
diff --git a/abra.sh b/abra.sh
index fc4fb4a..1eb854e 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1 +1 @@
-export CONFIG_YML_VERSION=v1
\ No newline at end of file
+export CONFIG_YML_VERSION=v2
diff --git a/compose.smtp.yml b/compose.smtp.yml
index b210297..777ec06 100644
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@@ -10,9 +10,9 @@ services:
       - SMTP_FROM_EMAIL
       
     secrets:
-      - smtp_pasword
+      - smtp_password
 
 secrets:
   smtp_password:
     external: true
-    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
\ No newline at end of file
+    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
diff --git a/compose.yml b/compose.yml
index cbed7c7..6aa5ade 100644
--- a/compose.yml
+++ b/compose.yml
@@ -27,12 +27,6 @@ services:
         - "traefik.http.routers.${STACK_NAME}_api.rule=Host(`${DOMAIN}`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)"
         - "traefik.http.routers.${STACK_NAME}_api.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}_api.tls.certresolver=${LETS_ENCRYPT_ENV}"
-    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:3456" ]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 1m
 
   app:
     image: vikunja/frontend
diff --git a/config.yml.tmpl b/config.yml.tmpl
index 47fc9c6..ee25f78 100644
--- a/config.yml.tmpl
+++ b/config.yml.tmpl
@@ -136,11 +136,11 @@ mailer:
   # SMTP username
   username: {{ env "SMTP_USER" }}
   # SMTP password
-  password: {{ secret "SMTP_PASSWORD" }}
+  password: {{ secret "smtp_password" }}
   # Wether to skip verification of the tls certificate on the server
   skiptlsverify: false
   # The default from address when sending emails
-  fromemail: {{ secret "SMTP_FROM_EMAIL" }}
+  fromemail: {{ env "SMTP_FROM_EMAIL" }}
   # The length of the mail queue.
   queuelength: 100
   # The timeout in seconds after which the current open connection to the mailserver will be closed.
@@ -325,4 +325,4 @@ auth:
 #   username:
 #   # If set to a non-empty value the /metrics endpoint will require this as a password via basic auth in combination with the username below.
 #   password:
-# 
\ No newline at end of file
+#