diff --git a/slapos/recipe/generic_mysql/__init__.py b/slapos/recipe/generic_mysql/__init__.py
index 4fa4064bea95f8b1e0c853a37a48068371993e72..f2dd1e3289826bba676c0af40afb61f3273d6ecf 100644
--- a/slapos/recipe/generic_mysql/__init__.py
+++ b/slapos/recipe/generic_mysql/__init__.py
@@ -30,9 +30,6 @@ import os
 class Recipe(GenericBaseRecipe):
 
   def _options(self, options):
-    options['password'] = self.generatePassword()
-    if 'test-database' in options:
-      options['test-password'] = self.generatePassword()
     options.setdefault('parallel-test-database-amount', '0')
     for x in xrange(int(options['parallel-test-database-amount'])):
       options['test-password-%s' % x] = self.generatePassword()
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 357ec75fe296eae8bb0971b906d983b093c6d175..312e6d30aad53f2c6335954ad29b4616ab3d091e 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -181,7 +181,7 @@ context =
 [template-mariadb]
 < = template-jinja2-base
 filename = instance-mariadb.cfg
-md5sum = 49ae6f1bf97d3755978fe08b8e29fb5a
+md5sum = b5500e3fdb5f64fbaff9137c394f576f
 extra-context =
     key coreutils_location coreutils:location
     key dcron_location dcron:location
diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in
index 6acf65681925166160fe7d54d32314d5df194694..c853b7c12706f705b3e2d4bf36aabeb4e772ec19 100644
--- a/stack/erp5/instance-mariadb.cfg.in
+++ b/stack/erp5/instance-mariadb.cfg.in
@@ -38,6 +38,8 @@ test-user = erp5_test
 test-database = erp5_test
 mysql-test-database-base = testdb
 mysql-test-user-base = testuser
+password = ${generate-password:passwd}
+test-password = ${:password}
 
 # Paths
 wrapper = ${basedirectory:services}/mariadb
@@ -102,6 +104,11 @@ pt-visual-explain-binary = {{ perl_siteprefix }}/bin/pt-visual-explain
 xtrabackup-binary = {{ xtrabackup_location }}/bin/xtrabackup_51
 perl-binary = {{ perl_location }}/bin/perl
 
+[generate-password]
+recipe = slapos.cookbook:generate.password
+storage-path = ${rootdirectory:srv}/passwd
+bytes = 32
+
 [logrotate]
 recipe = slapos.cookbook:logrotate
 # Binaries