diff --git a/geonetwork/geonetwork/defaults/main.yml b/geonetwork/geonetwork/defaults/main.yml
index 74d3f7de..0e2a4556 100644
--- a/geonetwork/geonetwork/defaults/main.yml
+++ b/geonetwork/geonetwork/defaults/main.yml
@@ -16,8 +16,9 @@ geonetwork_data_directory: /srv/geonetwork_data
 geonetwork_config_skipinfo: 'n'
 geonetwork_config_postgresql: True
 
-# No other database are supported
-geonetwork_db_type: postgres-postgis
+# Only postgres and the embedded DB are supported
+# Values: postgres-postgis (3.2+ only), postgres (3.0 only), h2
+# geonetwork_db_type: postgres-postgis
 geonetwork_db_name: geonetwork_db
 geonetwork_db_user: geonetwork_u
 #geonetwork_db_pwd: use_a_vault_file
diff --git a/geonetwork/geonetwork/templates/srv.xml.j2 b/geonetwork/geonetwork/templates/srv.xml.j2
index 2aa985f6..670a340e 100644
--- a/geonetwork/geonetwork/templates/srv.xml.j2
+++ b/geonetwork/geonetwork/templates/srv.xml.j2
@@ -36,18 +36,5 @@
     <property name="defaultNode" value="true"/>
   </bean>
 
-  <!-- Uncomment the database configuration you need to use -->
-  <!--<import resource="../config-db/h2.xml"/>-->
-  <!--<import resource="../config-db/jndi-postgres-postgis.xml"/> -->
-  <!--<import resource="../config-db/oracle.xml"/>-->
-  <!--<import resource="../config-db/mysql.xml"/> -->
-  <!--<import resource="../config-db/db2.xml"/> -->
-  <!--<import resource="../config-db/postgres.xml"/>-->
-  <!--<import resource="../config-db/sqlserver.xml"/> -->
-  <!--<import resource="../config-db/postgres-postgis.xml"/> -->
-{% if geonetwork_point_version >= 2 %}
-  <import resource="../config-db/{{ geonetwork_db_type }}.xml"/>
-{% else %}
-  <import resource="../config-db/postgres.xml"/>
-{% endif %}
+  <import resource="../config-db/{{ geonetwork_db_type | default(' postgres-postgis') }}.xml"/>
 </beans>