diff --git a/roles/services/files/test-z90-vn-test-db.cnf b/roles/services/files/test/z90-vn.cnf
similarity index 98%
rename from roles/services/files/test-z90-vn-test-db.cnf
rename to roles/services/files/test/z90-vn.cnf
index 3a96c74..b705a22 100644
--- a/roles/services/files/test-z90-vn-test-db.cnf
+++ b/roles/services/files/test/z90-vn.cnf
@@ -96,5 +96,5 @@ performance_schema                                         = ON
 performance_schema_digests_size                            = 20000
 performance-schema-consumer-events-statements-history      = ON
 performance_schema_consumer_events_statements_history_long = ON
-query_response_time_stats                                  = ON
+#query_response_time_stats                                  = ON
 userstat                                                   = ON
diff --git a/roles/services/files/test-z92-testing.cnf b/roles/services/files/test/z92-testing.cnf
similarity index 100%
rename from roles/services/files/test-z92-testing.cnf
rename to roles/services/files/test/z92-testing.cnf
diff --git a/roles/services/files/test-z99-local-test-db.cnf b/roles/services/files/test/z99-local.cnf
similarity index 100%
rename from roles/services/files/test-z99-local-test-db.cnf
rename to roles/services/files/test/z99-local.cnf
diff --git a/roles/services/tasks/mariadb.yml b/roles/services/tasks/mariadb.yml
index 30a9aba..081ed7e 100644
--- a/roles/services/tasks/mariadb.yml
+++ b/roles/services/tasks/mariadb.yml
@@ -90,7 +90,7 @@
 
 - when: production is true
   block:
-  - name: Set MariaDB custom configuration
+  - name: Set MariaDB custom configuration Producution
     copy:
       src: "{{ item }}"
       dest: /etc/mysql/mariadb.conf.d/
@@ -110,9 +110,9 @@
         - /mnt/local-backup
         Make sure they are correctly configured and accessible.
 
-- when: test-db is true
+- when: testdb is true
   block:
-  - name: Set MariaDB custom configuration
+  - name: Set MariaDB custom configuration Test
     copy:
       src: "{{ item }}"
       dest: /etc/mysql/mariadb.conf.d/
@@ -120,7 +120,7 @@
       group: root
       mode: u=rw,g=r,o=r
     with_fileglob:
-        - "files/test*.cnf"
+        - "files/test/z9*.cnf"
     notify: restart-mariadb
   
   - name: Reminder to check mount points