diff --git a/2.database/01.CreateTables.sql b/2.database/01.CreateTables.sql
index b7808ff..e810a77 100644
--- a/2.database/01.CreateTables.sql
+++ b/2.database/01.CreateTables.sql
@@ -208,7 +208,6 @@ CREATE TABLE myhealth.medicaltest
 )
 TABLESPACE pg_default;
 
-<<<<<<< HEAD
 -- Permisos
 ALTER TABLE myhealth.administrator              OWNER to "USER";
 ALTER TABLE myhealth.primaryhealthcarecenter    OWNER to "USER";
@@ -232,45 +231,4 @@ GRANT ALL ON myhealth.question                   to usrmyhealth;
 GRANT ALL ON myhealth.medicaltest                to usrmyhealth;
 
 END;
-$$
-=======
-
--- Inserta Especialidades médicas
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Alergologia','Especialidad médica de Alergologia');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía cardiaca','Especialidad médica de Cirugía cardiaca');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía general','Especialidad médica de Cirugía general');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía plastica','Especialidad médica de Cirugía plastica');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía de mama','Especialidad médica de Cirugía de mama');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía maxilofacial','Especialidad médica de Cirugía maxilofacial');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía vascular','Especialidad médica de Cirugía vascular');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Dermatología','Especialidad médica de Dermatología');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Endocrinología y nutrición','Especialidad médica de Endocrinología y nutrición');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Gastroenterología- digestivo','Especialidad médica de Gastroenterología- digestivo');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Neurocirugía','Especialidad médica de Neurocirugía');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Oftalmología','Especialidad médica de Oftalmología');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Otorrinolaringologia','Especialidad médica de Otorrinolaringologia');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Oncología','Especialidad médica de Oncología');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Pediatría','Especialidad médica de Pediatría');
-
-INSERT INTO myhealth.primaryhealthcarecenter(name, location)
-	VALUES ('Centro A', 'Descripción centro A');
-INSERT INTO myhealth.primaryhealthcarecenter(name, location)
-	VALUES ('Centro Medico Azul', 'Descripción centro medico azul');
-INSERT INTO myhealth.primaryhealthcarecenter(name, location)
-	VALUES ('Centro Medico 23', 'Descripción centro medico 23');
->>>>>>> utilizar docker para ejecutar una version ya compilada, pendiente compilar y configurar usuario de jboss
+$$
\ No newline at end of file
diff --git a/4.docker/docker-compose.yml b/4.docker/docker-compose.yml
index f257709..4ed21ba 100644
--- a/4.docker/docker-compose.yml
+++ b/4.docker/docker-compose.yml
@@ -7,6 +7,7 @@ services:
         environment:
             - POSTGRES_USER=USER
             - POSTGRES_PASSWORD=PASSWORD
+            - POSTGRES_DB=myhealth
         volumes:
             - ../2.database/01.CreateTables.sql:/docker-entrypoint-initdb.d/init.sql
     wildfly:
@@ -14,10 +15,9 @@ services:
         ports:
             - "8080:8080"
         environment:
-            - DB_HOST=postgres
-            - DB_NAME=postgres
             - DB_USER=USER
             - DB_PASS=PASSWORD
             - JBOSS_HOME=/opt/jboss/wildfly
         depends_on:
             - postgres
+
diff --git a/4.docker/standalone.xml b/4.docker/standalone.xml
index ac47701..ee2fbea 100644
--- a/4.docker/standalone.xml
+++ b/4.docker/standalone.xml
@@ -146,7 +146,7 @@
         <subsystem xmlns="urn:jboss:domain:datasources:5.0">
             <datasources>
                 <datasource jta="false" jndi-name="java:jboss/postgresDS" pool-name="postgresDS" enabled="true" use-java-context="true" use-ccm="false">
-                    <connection-url>jdbc:postgresql://postgres:5432/postgres</connection-url>
+                    <connection-url>jdbc:postgresql://postgres:5432/myhealth</connection-url>
                     <driver-class>org.postgresql.Driver</driver-class>
                     <driver>postgresql</driver>
                     <security>