diff --git a/.env.sample b/.env.sample
index 1c75d5c..900589c 100644
--- a/.env.sample
+++ b/.env.sample
@@ -35,3 +35,6 @@ WELCOME_MESSAGE="Welcome to Authentik"
 DEFAULT_LANGUAGE=en
 AUTHENTIK_FOOTER_LINKS='[{"name": "My Organization","href":"https://example.com"}]'
 COPY_ASSETS="flow_background.jpg|app:/web/dist/assets/images/ icon_left_brand.svg|app:/web/dist/assets/icons/ icon.png|app:/web/dist/assets/icons/"
+
+EMAIL_SUBJECT="Account Recovery"
+EMAIL_TOKEN_EXPIRY_MINUTES=30
diff --git a/abra.sh b/abra.sh
index 788dbfe..a63b0c6 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,5 +1,5 @@
 export CUSTOM_CSS_VERSION=v2
-export CUSTOM_FLOWS_VERSION=v2
+export CUSTOM_FLOWS_VERSION=v3
 
 customize() {
     if [ -z "$1" ]
@@ -31,7 +31,7 @@ if (token:= Token.objects.filter(identifier='authentik-bootstrap-token').first()
     token.key=key
     token.save()
     print('Changed authentik-bootstrap-token')
-else: 
+else:
     Token.objects.create(
         identifier='authentik-bootstrap-token',
         user=akadmin,
diff --git a/compose.yml b/compose.yml
index 13a2c18..308bfe1 100644
--- a/compose.yml
+++ b/compose.yml
@@ -23,6 +23,8 @@ x-env: &env
     - AUTHENTIK_IMPERSONATION
     - WELCOME_MESSAGE
     - DEFAULT_LANGUAGE
+    - EMAIL_SUBJECT
+    - EMAIL_TOKEN_EXPIRY_MINUTES
     - DOMAIN
 
 version: '3.8'
diff --git a/custom_flows.yaml.tmpl b/custom_flows.yaml.tmpl
index be4c381..099ddea 100644
--- a/custom_flows.yaml.tmpl
+++ b/custom_flows.yaml.tmpl
@@ -12,7 +12,7 @@ context:
   transl_name: {{ if eq (env "DEFAULT_LANGUAGE") "de" }} Vor- und Nachname {{ else }} Full name {{ end }}
 
 entries:
-######## Email Recovery Flow ######## 
+######## Email Recovery Flow ########
 - identifiers:
     slug: default-recovery-flow
   id: recovery_flow
@@ -54,8 +54,8 @@ entries:
   model: authentik_stages_email.emailstage
   attrs:
     use_global_settings: true
-    token_expiry: 30
-    subject: authentik
+    token_expiry: {{ env "EMAIL_TOKEN_EXPIRY_MINUTES" }}
+    subject: "{{ env "EMAIL_SUBJECT" }}"
     template: email/password_reset.html
     activate_user_on_success: true
 - identifiers:
@@ -174,7 +174,7 @@ entries:
 
 
 
-######## Authentication Flow ######## 
+######## Authentication Flow ########
 - attrs:
     designation: authentication
     name: custom-authentication-flow
@@ -236,7 +236,7 @@ entries:
     target: !KeyOf authentication_flow
   model: authentik_flows.flowstagebinding
 
-######## Invitation Enrollment Flow ######## 
+######## Invitation Enrollment Flow ########
 - attrs:
     designation: enrollment
     name: invitation-enrollment-flow
@@ -336,7 +336,7 @@ entries:
 
 ######## System Tenant ##########
 - attrs:
-    attributes: 
+    attributes:
       settings:
         locale: {{ env "DEFAULT_LANGUAGE" }}
     # branding_favicon: /static/dist/assets/icons/icon.png