diff --git a/roles/jitsi/tasks/install.yml b/roles/jitsi/tasks/install.yml
index 4497d8a..67e9049 100644
--- a/roles/jitsi/tasks/install.yml
+++ b/roles/jitsi/tasks/install.yml
@@ -25,11 +25,6 @@
   when: not jitsi_key_file.stat.exists
   tags: jitsi
 
-  # Needed if you use a proxy, as maven does not honor the standard http_proxy / https_proxy env vars
-- name: Configure maven for {{ jitsi_user }}
-  template: src=maven.xml.j2 dest={{ jitsi_root_dir }}/.m2/settings.xml
-  tags: jitsi
-
   # Now, for every component, we will clone or update the repo.
   # If the repo changed since the last run, we rebuild and restart the corresponding component
 - name: Clone jicofo repo
diff --git a/roles/maven/tasks/install.yml b/roles/maven/tasks/install.yml
index 744f606..3ca8ad5 100644
--- a/roles/maven/tasks/install.yml
+++ b/roles/maven/tasks/install.yml
@@ -31,6 +31,11 @@
   when: mvn_install_mode != 'none'
   tags: mvn
 
+  # Needed if you use a proxy, as maven does not honor the standard http_proxy / https_proxy env vars
+- name: Configure maven
+  template: src=maven.xml.j2 dest={{ mvn_root_dir }}/apache-maven/conf/settings.xml
+  tags: jitsi
+
 - name: Write installed version
   copy: content={{ mvn_version }} dest={{ mvn_root_dir }}/meta/ansible_version
   tags: mvn
diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml
index def684a..f7f45de 100644
--- a/roles/metabase/defaults/main.yml
+++ b/roles/metabase/defaults/main.yml
@@ -50,16 +50,3 @@ metabase_lang: fr
 # Will most likely need to be adjusted, because you'll put it behind a reverse proxy don't you ?
 metabase_public_url: http://{{ inventory_hostname }}:{{ metabase_port }}/
 
-# LDAP Auth settings
-metabase_ldap: "{{ (ad_auth | default(False) or ldap_auth | default(False)) | ternary(True,False) }}"
-metabase_ldap_attr_email: mail
-metabase_ldap_attr_firstname: givenName
-metabase_ldap_attr_lastname: sn
-metabase_ldap_server: "{{ (ldap_uri is defined) | ternary(ldap_uri | urlsplit('hostname'), ad_auth | default(False) | ternary(ad_realm | default(samba_realm) | default(ansible_domain) | lower, ansible_domain)) }}"
-metabase_ldap_port: "{{ (ldap_auth is defined and ldap_auth | urlsplit('port') is search('\\d+')) | ternary(ldap_auth | urlsplit('port'), '389') }}"
-# metabase_ldap_user: CN=Metabase,OU=Apps,DC=example,DC=org
-# metabase_ldap_pass: S3cr3t.
-metabase_ldap_user_base: "{{ (ad_ldap_user_search_base is defined and ad_auth) | ternary(ad_ldap_user_search_base, ad_auth | default(False) | ternary('DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC='), 'ou=Users,' + ldap_base)) }}"
-metabase_ldap_user_filter: (&{{ ad_auth | default(False) | ternary('(objectClass=user)(objectCategory=person)(primaryGroupId=513)','(objectClass=inetOrgPerson)') }}(|(uid={login})(mail={login}))
-metabase_ldap_group_base: "{{ (ad_ldap_group_search_base is defined and ad_auth) | ternary(ad_ldap_group_search_base, ad_auth | default(False) | ternary('DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC='), 'ou=Groups,' + ldap_base)) }}"
-
diff --git a/roles/metabase/templates/env.j2 b/roles/metabase/templates/env.j2
index 28f6d7d..7c32e16 100644
--- a/roles/metabase/templates/env.j2
+++ b/roles/metabase/templates/env.j2
@@ -15,29 +15,9 @@ MB_DB_USER={{ metabase_db_user }}
 MB_DB_PASS={{ metabase_db_pass | quote }}
 MB_DB_PORT={{ metabase_db_port }}
 MB_DB_TYPE=mysql
-MB_ENABLE_QUERY_CACHING=true
-MB_ENABLE_PUBLIC_SHARING=true
-MB_ENABLE_EMBEDDING=true
 MB_ENCRYPTION_SECRET_KEY={{ metabase_encryption_key | quote }}
 MB_JETTY_HOST=0.0.0.0
 MB_JETTY_PORT={{ metabase_port }}
 MB_PLUGINS_DIR={{ metabase_root_dir }}/plugins
 MB_SITE_LOCALE={{ metabase_lang }}
 MB_SITE_URL={{ metabase_public_url }}
-{% if metabase_ldap %}
-MB_LDAP_ENABLED=true
-MB_LDAP_HOST={{ metabase_ldap_server }}
-MB_LDAP_PORT={{ metabase_ldap_port }}
-MB_LDAP_SECURITY=tls
-{% if metabase_ldap_user is defined and metabase_ldap_pass is defined %}
-MB_LDAP_BIND_DN={{ metabase_ldap_user | quote }}
-MB_LDAP_PASSWORD={{ metabase_ldap_pass | quote }}
-{% endif %}
-MB_LDAP_ATTRIBUTE_EMAIL={{ metabase_ldap_attr_email }}
-MB_LDAP_ATTRIBUTE_FIRSTNAME={{ metabase_ldap_attr_firstname }}
-MB_LDAP_ATTRIBUTE_LASTNAME={{ metabase_ldap_attr_lastname }}
-MB_LDAP_USER_BASE={{ metabase_ldap_user_base }}
-MB_LDAP_USER_FILTER={{ metabase_ldap_user_filter | quote }}
-MB_LDAP_GROUP_SYNC=true
-MB_LDAP_GROUP_BASE={{ metabase_ldap_group_base }}
-{% endif %}
diff --git a/roles/metabase/templates/metabase.service.j2 b/roles/metabase/templates/metabase.service.j2
index f78f310..fb8c231 100644
--- a/roles/metabase/templates/metabase.service.j2
+++ b/roles/metabase/templates/metabase.service.j2
@@ -13,6 +13,7 @@ ExecStart=/usr/bin/java -Djava.net.preferIPv4Stack=true \
             -Dhttps.proxyHost={{ system_proxy | urlsplit('hostname') }} -Dhttps.proxyPort={{ system_proxy | urlsplit('port') }} \
 {% endif %}
             -jar {{ metabase_root_dir }}/app/metabase.jar
+SuccessExitStatus=143
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full