diff --git a/apps/dhp-broker-application/pom.xml b/apps/dhp-broker-application/pom.xml
index 0b20d095..83a96aa0 100644
--- a/apps/dhp-broker-application/pom.xml
+++ b/apps/dhp-broker-application/pom.xml
@@ -109,5 +109,16 @@
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ true
+
+
+
+
diff --git a/apps/dhp-broker-application/src/main/resources/application.properties b/apps/dhp-broker-application/src/main/resources/application.properties
index f571b6c1..db271fdf 100644
--- a/apps/dhp-broker-application/src/main/resources/application.properties
+++ b/apps/dhp-broker-application/src/main/resources/application.properties
@@ -24,12 +24,12 @@ lbs.database.url = ${spring.datasource.url}
# for localhost
lbs.elastic.clusterNodes = 127.0.0.1:9200
-lbs.elastic.homepage = http://127.0.0.1:9200/_plugin/hq
+lbs.elastic.homepage = http://
-lbs.elastic.eventsIndexName = events_beta_michele
+lbs.elastic.eventsIndexName = oa_events_beta
lbs.elastic.eventsIndexType = event
-lbs.elastic.notificationsIndexName = notifications_beta_michele
+lbs.elastic.notificationsIndexName = oa_notifications_beta
lbs.elastic.notificationsIndexType = notification
lbs.mail.from = notifications-noreply@openaire.eu
diff --git a/apps/dhp-broker-application/src/main/resources/config/mapping_es7.sh b/apps/dhp-broker-application/src/main/resources/config/mapping_es7.sh
index eb2841d6..f40cd1e5 100755
--- a/apps/dhp-broker-application/src/main/resources/config/mapping_es7.sh
+++ b/apps/dhp-broker-application/src/main/resources/config/mapping_es7.sh
@@ -1,8 +1,8 @@
#!/bin/bash
INDEXBASEURL=http://localhost:9200
-EVENTINDEXNAME=events_beta_michele
-NOTIFICATIONINDEXNAME=notifications_beta_michele
+EVENTINDEXNAME=oa_events_beta
+NOTIFICATIONINDEXNAME=oa_notifications_beta
echo
echo "Fixing events index..."
diff --git a/apps/dnet-orgs-database-application/pom.xml b/apps/dnet-orgs-database-application/pom.xml
index 07acbed9..1eba46a3 100644
--- a/apps/dnet-orgs-database-application/pom.xml
+++ b/apps/dnet-orgs-database-application/pom.xml
@@ -67,5 +67,16 @@
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ true
+
+
+
+
diff --git a/apps/dnet-orgs-database-application/src/main/resources/sql/users.sql b/apps/dnet-orgs-database-application/src/main/resources/sql/users.sql
new file mode 100644
index 00000000..933c02bb
--- /dev/null
+++ b/apps/dnet-orgs-database-application/src/main/resources/sql/users.sql
@@ -0,0 +1,7 @@
+INSERT INTO users(email, valid, role) VALUES ('michele.artini@isti.cnr.it', true, 'ADMIN');
+INSERT INTO users(email, valid, role) VALUES ('michele.debonis@isti.cnr.it', true, 'ADMIN');
+INSERT INTO users(email, valid, role) VALUES ('andreas.czerniak@uni-bielefeld.de', true, 'ADMIN');
+INSERT INTO users(email, valid, role) VALUES ('claudio.atzori@isti.cnr.it', true, 'ADMIN');
+INSERT INTO users(email, valid, role) VALUES ('emma.lazzeri@isti.cnr.it', true, 'ADMIN');
+INSERT INTO users(email, valid, role) VALUES ('gina.pavone@isti.cnr.it', true, 'ADMIN');
+INSERT INTO users(email, valid, role) VALUES ('paolo.manghi@isti.cnr.it', true, 'ADMIN');