diff --git a/src-db/database/build-create.xml b/src-db/database/build-create.xml
--- a/src-db/database/build-create.xml
+++ b/src-db/database/build-create.xml
@@ -82,7 +82,7 @@
         </fileset>
       </classpath>
       <transaction>
-        DROP DATABASE ${bbdd.sid};
+        DROP DATABASE "${bbdd.sid}";
       </transaction>
     </sql>
     <sql driver="${bbdd.driver}" url="${bbdd.url}" userid="${bbdd.systemUser}" password="${bbdd.systemPassword}" onerror="continue" autocommit="true">
@@ -93,7 +93,7 @@
         </fileset>
       </classpath>
       <transaction>
-        DROP ROLE ${bbdd.user};
+        DROP ROLE "${bbdd.user}";
       </transaction>
     </sql>
   </target>
@@ -193,7 +193,7 @@
       </classpath>
       <transaction>
         --CREATING USER
-        CREATE ROLE ${bbdd.user} LOGIN PASSWORD '${bbdd.password}'
+        CREATE ROLE "${bbdd.user}" LOGIN PASSWORD '${bbdd.password}'
                SUPERUSER CREATEDB CREATEROLE
                VALID UNTIL 'infinity';
         
@@ -208,9 +208,9 @@
         </fileset>
       </classpath>
       <transaction>
-        CREATE DATABASE ${bbdd.sid}
+        CREATE DATABASE "${bbdd.sid}"
                   WITH ENCODING='UTF8'
-                  OWNER=${bbdd.user}
+                  OWNER="${bbdd.user}"
                   TEMPLATE=template0;
       </transaction>
     </sql>