diff --git a/.metals/metals.h2.db b/.metals/metals.h2.db
index 26879aa..f754a41 100644
Binary files a/.metals/metals.h2.db and b/.metals/metals.h2.db differ
diff --git a/.metals/metals.log b/.metals/metals.log
index 313297f..3e02ea8 100644
--- a/.metals/metals.log
+++ b/.metals/metals.log
@@ -41,3 +41,15 @@ INFO: Unsupported notification method: $/setTraceNotification
 Apr 19, 2020 6:44:45 PM org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint notify
 INFO: Unsupported notification method: $/setTraceNotification
 INFO  shutting down Metals
+INFO  started: Metals version 0.8.4 in workspace '/home/magnusanatolius/works/in-sylva.infrastructure'
+INFO  time: initialize in 3.78s
+WARN  no build tool detected in workspace '/home/magnusanatolius/works/in-sylva.infrastructure'. The most common cause for this problem is that the editor was opened in the wrong working directory, for example if you use sbt then the workspace directory should contain build.sbt. 
+Apr 23, 2020 2:42:36 AM org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint notify
+INFO: Unsupported notification method: $/setTraceNotification
+Apr 23, 2020 2:42:36 AM org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint notify
+INFO: Unsupported notification method: $/setTraceNotification
+INFO  shutting down Metals
+INFO  started: Metals version 0.8.4 in workspace '/home/magnusanatolius/works/in-sylva.infrastructure'
+INFO  time: initialize in 1.54s
+WARN  no build tool detected in workspace '/home/magnusanatolius/works/in-sylva.infrastructure'. The most common cause for this problem is that the editor was opened in the wrong working directory, for example if you use sbt then the workspace directory should contain build.sbt. 
+INFO  shutting down Metals
diff --git a/admin-key.pem b/admin-key.pem
index c605c40..2938fb4 100644
--- a/admin-key.pem
+++ b/admin-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCxuhCyqixVl9Dw
-CSJcw5IYEVXND+tVK+v8iKQweJT28bikkDJcbDVPRElCMQJKua1NTYQ/tE7YozkR
-rdbjfnd61n1ou0y7h28DMfM6YTnPRnw56iomLzR734gIckVG+AdBt1Wxs+pf+CG5
-UziephGXKEbyj/ZeE+dHJYafNBylJaQgKQhAMm5GxxxqY5pKmdDzJq1Xjx/obOcb
-w2EUsLOCtlSrVjCNm+zEwkDRmI9JHueuZamVIYUmKEuJGdt4ohefy2cEzc8Vdl9s
-ddsoVq+ny2fcFjag0qsNpcZLCOpw4HdMRDfwoQIja3ARpLlSKpSqBaN3fBNmvmBj
-Zk+1so8tAgMBAAECggEBAKLPFGTXR23ReXGqrHPWJIsvti34G1kWt0PL2L0eeTgP
-D1qRTdEkv2Ex6Ppd8v+JQJzEGhZRkrkaLTloyqX0QHei7Zd3nT9dPfDrXSlpz491
-vm8/eAUq0SV5DCDQrW3p4Jvu2u3DJz1rDVm8Ru3uq8aQ+w1RnBtqmD+wvLYzAtq1
-LT2j8n9NaJcfak9u+nERMJ7E55OymRqvsUdq6l+kyM4mQTvzGp3Vh6NvKhhD0j3i
-oX9hj7JH3LukG/CXqW0NtJkhreeHrIUkDB6vXl35d+CGAqp5jSTsgxrSxQ5P44VL
-GWgQ43AxQryMZpekksQPGXZcFNuI0o2US3/Ib8nxBnECgYEA4j35MIA01FWCbSQE
-aEciEKdfw2lsRDkQ/ZMmLiO30xXrnnFDGuE1USm2TjePJcjQhN4yESbUfxTN4AKe
-Xh1GkjqDsM8KHsu13iy2pF4rhVyHt6W+pgXRShgLpcuYnJ8jI8djwx5eubOWLFK9
-4XGbdJhZMMsBBiUb6YTAgvKNU4MCgYEAyRp8L9DGSawwkat6FdpqHanAXwUi0hOl
-v+t0i75EWXZDHaXNMYomn3TPrkasfrqrahZ6YjEsKQBg4t2+qpZkvdcfQgzxDvtg
-D/uOt9U9Kz2ceHPl1Y3ZCkgLfAj6TL1c7cfu0eklSqV/DEuJG59lQyXcor2MB/Vq
-Ejgo+5JyI48CgYEA1PKsOECUeT+7Mety0owRvkcsVgxGwbhNC8CTcV5hSigZzNqi
-5QwRWUG/vMOC03e+/TD/QzGfVbZJSY5tbfx0TnMRPTzDM9Vea67+gpu4ryA3Bl7V
-ogNbyTf0zqtiDBmlw6mLdz6Avp4QvctrumVqg0ZavRh28EfBi/1ODnMrHu0CgYBX
-aerHQgGe7njiKN5Vd24e3LWg1/OtyxqGFMvBHoBJPs2nqnVJ7lohf73ybAf4wh1W
-bNTfr64ZWG/EzUxejCbYGhUdOdDiiUPVTqxXnhoLnKlR9lbV/+VywaQ0UxaxmrI1
-LW3S0nwCOXPDHWZImn2CtYd1Od0PbI6hwsWVrK9uYwKBgQDSyZXS8B3IFQFwCTr7
-2k8Nw5a2sX7yqLGsxRmxq/d+UiD1dlIOQQ122SVu55H9UFCe/ZtG9REZsZTH08df
-RNNhZ0oUB4r2h7X+fK1ker3ncT7e6lP3DC3RY4n+090P0g9Nkt+yJhbJRjekrpSk
-LKykCs20EIO3aQOlHHbdtZoEWA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8uPjEqEB3Xs7L
+ot0ghzYr976PVW2oVE7T/dfWbN7oT+ycDWOkrUzJs4j2/0A1x1stmTPJh/nI42Kh
+ciJByXG+Yjr8xX+QyNflC2GTSHJtTCqBFVPRi3dzBh/rHareY/RVxuehc3NCIch5
+xs5OV0UQOt7eL8/yNuD2qdByZKg1ra0E1+5gk/pxH0QDb4/TFWgJXvgCBVKe7mRF
+5eHzs6QWr9WQl49qeAcTs4OOVZkBthKUoBLsbqOxKxBserXIoBNly4+OwvWt/fhe
+2XK38YJYgb3Rla2kYXKB9e0/OXkmSvROz3zwSpg9qanv39MPCbrJN/srFAcpn6Sn
+rdzo312NAgMBAAECggEBAJu1Ictf5pCWsJhjL37/EDsGlTs9iNQxezh9X++Ss/eI
+ufenNGdSdOCWOJNR1nCIoznkBU5p2jVdJqt9t7X/ttEVywVzDeUvULGxyjfytjZn
+eUo3hoiFQXCtxPf/6lLCtX1wNvyGfLo7lWSkGuOYLWtOp0M6v59gmAvr4AgB9KcT
+0aZGLUvOMtGeffoK0eIBiac5GzbgkO2UYJwG7KiUJodv4O1+MIllGb7XX3kmi/2m
+HhGr2EsikcL7nJI9GUfMOSwOoOrQovREImju9ZOlygwUU3k8F4+ZNJInNvWOaSTq
+f58CqXTrRHwxO/ART+d1PuzIlCvJlnUG6hHvhIAoJyECgYEA4oVHHSWIZJILMTE/
+bwNkWg8qD96A98zTeoV5RCuCBDSjhq18adkuGf3GTHEIXA79sVsTK0lGHqQiWdCi
++BczSmoarzl4sqNup+4735/di3aaKjBHfhS5wIB6mFgfQTDDbYBgD22sLaKaehJv
+Fxgl1HH0S8dbo/XJnus3jaKW0HsCgYEA1Uhrfjx3zVJnIuCwxbxlluS33lQ+qjdl
+kvomDRmo+WdNJi75hc+a449s+iHukCP8dlKKBFoLj0nzPXSYjFF13t+zsYMmXdV2
+eWWpvVnGojjWHkQFMjHo5abnWNtpTwJtfBSbjOkzcxekdBKOAxc/1MHPcN/ZQLRc
+Gw5XX3Lqn5cCgYByG92FC0E4GHHW6A4iaD0HORhhQh8JtX7a+53o/1nRsIqn74D6
++VLF+RcJru8dINgfndd8OL8/9ELxp65Q9674z5Z9qp/orXey1MoIjsnV1Xs3wXZi
+RyKDnLUlRU8JUf1AjijV3NOdcYoL8HlR0vJLoNQF0HmTkN9uVON5T+xVPQKBgETI
+5mH//mMpgDmvXVNoPxs7CFGbudoLo6aTJlJzRBurRSZbX/3Xxow9ZVgGOXojIPjI
+BdsBb1j28IuRXuFiJDGM09ccBPOeNGdScjuvCHCpA+Ue6s4VapcmDNaLbJsenVC3
+FLONQhqMNW15znMQvHVRTCWLC/XiNRJEvcj6ttBhAoGAKpc8vB2/1oYokNUsm41w
+N1hU3/vZUIodU23Xq7zlBeW/ORDyFkc3Ma8xGxfCwIQGntHidgYq7Ukd0a5PC16Y
+EUooI6ErlWcqB/b22VyGDKLjIAnGMaf6uXyiVwQqJmwr3FIaV1SxqpO8OkRXt/TO
+KEtci6UrFII6ClGmsi6pgUQ=
 -----END PRIVATE KEY-----
diff --git a/admin.pem b/admin.pem
index a3e3826..05ce668 100644
--- a/admin.pem
+++ b/admin.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDQTCCAikCFCFrYZBerplClvWabUIF16kVNBReMA0GCSqGSIb3DQEBCwUAMFsx
+MIIDQTCCAikCFCFrYZBerplClvWabUIF16kVNBRgMA0GCSqGSIb3DQEBCwUAMFsx
 CzAJBgNVBAYTAkZSMQ0wCwYDVQQIDARQQUNBMRAwDgYDVQQHDAdBVklHTk9OMQ0w
 CwYDVQQKDARJTlJBMRAwDgYDVQQLDAdJTlNZTFZBMQowCAYDVQQDDAFOMB4XDTIw
-MDQxNTEzMjM1OVoXDTIwMDUxNTEzMjM1OVowXzELMAkGA1UEBhMCRlIxDTALBgNV
+MDUwMjAxMzEyN1oXDTIwMDYwMTAxMzEyN1owXzELMAkGA1UEBhMCRlIxDTALBgNV
 BAgMBFBBQ0ExEDAOBgNVBAcMB0FWSUdOT04xDTALBgNVBAoMBElOUkExEDAOBgNV
 BAsMB0lOU1lMVkExDjAMBgNVBAMMBWFkbWluMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAsboQsqosVZfQ8AkiXMOSGBFVzQ/rVSvr/IikMHiU9vG4pJAy
-XGw1T0RJQjECSrmtTU2EP7RO2KM5Ea3W4353etZ9aLtMu4dvAzHzOmE5z0Z8Oeoq
-Ji80e9+ICHJFRvgHQbdVsbPqX/ghuVM4nqYRlyhG8o/2XhPnRyWGnzQcpSWkICkI
-QDJuRsccamOaSpnQ8yatV48f6GznG8NhFLCzgrZUq1YwjZvsxMJA0ZiPSR7nrmWp
-lSGFJihLiRnbeKIXn8tnBM3PFXZfbHXbKFavp8tn3BY2oNKrDaXGSwjqcOB3TEQ3
-8KECI2twEaS5UiqUqgWjd3wTZr5gY2ZPtbKPLQIDAQABMA0GCSqGSIb3DQEBCwUA
-A4IBAQDM9DGyXw0f9Vw60dj7pVK+bYpF42jb0rknEMgwvioeZmWLDb6I7CaxWInK
-jLHfy6/qHDm531NRbaOVf1WtQkyLmrq1LFtf6wLFruD0KywF42wdKA6fizrHiYk+
-wPgY8KPZ2DkE49DRhQqlpPm1vUG061dttSBRe3WqRgXM5UyTbqU4csajOwuHA7ZL
-7wGQUzVWUT45mPS6JuVnswfOR8UAQgRXafKGYGsc8jT5d6PO0wyVwGLvqYCGREyp
-wz7GD4K/551IsSBTi1E37VNG/8MqIVJefNQYbSnIrw77irTod7ivX/sxYWKpfxqD
-ggU8Tm6a0QB0di+VQwbJbg61T33S
+AQ8AMIIBCgKCAQEAvLj4xKhAd17Oy6LdIIc2K/e+j1VtqFRO0/3X1mze6E/snA1j
+pK1MybOI9v9ANcdbLZkzyYf5yONioXIiQclxvmI6/MV/kMjX5Qthk0hybUwqgRVT
+0Yt3cwYf6x2q3mP0VcbnoXNzQiHIecbOTldFEDre3i/P8jbg9qnQcmSoNa2tBNfu
+YJP6cR9EA2+P0xVoCV74AgVSnu5kReXh87OkFq/VkJePangHE7ODjlWZAbYSlKAS
+7G6jsSsQbHq1yKATZcuPjsL1rf34Xtlyt/GCWIG90ZWtpGFygfXtPzl5Jkr0Ts98
+8EqYPamp79/TDwm6yTf7KxQHKZ+kp63c6N9djQIDAQABMA0GCSqGSIb3DQEBCwUA
+A4IBAQAew/oWEYn2nsa3+vLWtay49U/M6Yqyc/IRRRyu313RKQdU638rtcaTtLJ1
+Ujpkqberq37h9m5BqxdUpBYyO5rJJoUooyIsPUkr2jAUWtQXxTeEtMX7BDPi4LQn
+t3TtTw4aInOaEJn2m6Vg5VHuaNC+OXFuOwsKiVkznYGEnCd6BNcF7NdoEp52GOua
+mb8JzbvEMj519JkI8hSKOzNlfGXSe3aPsZhrA8E9I3VQz5v/9231fi7j06D5ooTh
+nEY6f+vB3SphDcgpgLSJBA+1Mmwfy7n/tPR2LckQBgUaXMuUiDmz3SM54Po2Sw6Y
+72c8HtjfQxlZpL1uRjUHv2ylvpWm
 -----END CERTIFICATE-----
diff --git a/build.sh b/build.sh
index 03b4bc8..9a92096 100644
--- a/build.sh
+++ b/build.sh
@@ -3,6 +3,7 @@
 
 # echo -n "Enter the name of public key (ex:id_ed25519): "
 # read publickey
+nmcli dev show | grep 'IP4.DNS'
 
 if [$1 -eq ""]
 then
@@ -49,6 +50,16 @@ case $imageName in
        wait
        echo -e $"source.manager image Successfully built\n"
        ;;
+    "search")
+       sh ./search/build.sh $1
+       wait
+       echo -e $"search image Successfully built\n"
+       ;;
+    "search-api")
+       sh ./search.api/build.sh $1
+       wait
+       echo -e $"search.api image Successfully built\n"
+       ;;
     "doc")
       sh ./doc/build.sh $1
       wait
@@ -73,6 +84,12 @@ case $imageName in
       sh ./source.manager/build.sh $1
       wait
       echo -e $"source.manager image Successfully built\n"
+      sh ./search/build.sh $1
+      wait
+      echo -e $"search image Successfully built\n"
+      sh ./search.api/build.sh $1
+      wait
+      echo -e $"search.api image Successfully built\n"
       sh ./doc/build.sh $1
       wait
       echo $"doc image Successfully built\n"
diff --git a/data.sql b/data.sql
index b727c5b..3362f38 100644
--- a/data.sql
+++ b/data.sql
@@ -7,8 +7,8 @@ CREATE TABLE IF NOT EXISTS users (
     surname varchar(50),
     email varchar(50) UNIQUE NOT NULL,
     password varchar(50) NOT NULL,
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE TABLE IF NOT EXISTS sources (
@@ -16,8 +16,8 @@ CREATE TABLE IF NOT EXISTS sources (
     name varchar(50) NOT NULL ,
     description text,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE TABLE IF NOT EXISTS sources_indices(
@@ -32,8 +32,8 @@ CREATE TABLE IF NOT EXISTS sources_indices(
         REFERENCES sources(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION, 
    
-   create_at timestamp NOT NULL DEFAULT NOW(),
-   update_at timestamp
+   createdAt timestamp NOT NULL DEFAULT NOW(),
+   updatedAt timestamp
 );
 
 CREATE table IF NOT EXISTS provider_sources (
@@ -49,8 +49,8 @@ CREATE table IF NOT EXISTS provider_sources (
         REFERENCES users(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE table IF NOT EXISTS std_fields(
@@ -73,8 +73,8 @@ CREATE table IF NOT EXISTS std_fields(
         REFERENCES std_fields(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE table IF NOT EXISTS std_fields_values(
@@ -86,8 +86,8 @@ CREATE table IF NOT EXISTS std_fields_values(
         REFERENCES std_fields(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE table IF NOT EXISTS addtl_fields(
@@ -109,8 +109,8 @@ CREATE table IF NOT EXISTS addtl_fields(
         REFERENCES addtl_fields(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE table IF NOT EXISTS addtl_fields_sources(
@@ -126,8 +126,8 @@ CREATE table IF NOT EXISTS addtl_fields_sources(
         REFERENCES sources(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 
@@ -135,15 +135,15 @@ CREATE table IF NOT EXISTS roles(
     id serial primary key,
     name varchar(50),
     description text,
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE table  IF NOT EXISTS realm(
       id serial primary key,
       name varchar(50),
-      create_at timestamp NOT NULL DEFAULT NOW(),
-      update_at timestamp
+      createdAt timestamp NOT NULL DEFAULT NOW(),
+      updatedAt timestamp
 );
 
 CREATE table  IF NOT EXISTS realm_user(
@@ -159,8 +159,8 @@ CREATE table  IF NOT EXISTS realm_user(
         REFERENCES  users(kc_id) MATCH SIMPLE
         ON UPDATE NO ACTION  ON DELETE  NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE table IF NOT EXISTS roles_std_fields(
@@ -176,8 +176,8 @@ CREATE table IF NOT EXISTS roles_std_fields(
         REFERENCES std_fields(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE table IF NOT EXISTS roles_addtl_fields(
@@ -193,8 +193,8 @@ CREATE table IF NOT EXISTS roles_addtl_fields(
         REFERENCES addtl_fields(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 
@@ -212,8 +212,8 @@ CREATE table IF NOT EXISTS roles_users (
         REFERENCES  users(kc_id) MATCH SIMPLE
         ON UPDATE NO ACTION  ON DELETE  NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE table  IF NOT EXISTS user_search_his(
@@ -225,8 +225,8 @@ CREATE table  IF NOT EXISTS user_search_his(
     query text,
     name varchar(50),
     description text,
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 create unique index sources_name_uindex
@@ -240,8 +240,8 @@ CREATE TABLE IF NOT EXISTS user_profile (
     CONSTRAINT user_profile_kc_id FOREIGN KEY (kc_id)
         REFERENCES users(kc_id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 ); 
 
 CREATE TABLE IF NOT EXISTS field_specifications (
@@ -259,8 +259,8 @@ CREATE TABLE IF NOT EXISTS field_specifications (
     CONSTRAINT field_specifications_kc_id FOREIGN KEY (kc_id)
         REFERENCES users(kc_id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 );
 
 CREATE TABLE IF NOT EXISTS profile_specifications(
@@ -273,15 +273,15 @@ CREATE TABLE IF NOT EXISTS profile_specifications(
     CONSTRAINT field_specifications_field_specification_id FOREIGN KEY (field_specification_id)
         REFERENCES field_specifications(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,
 
-    create_at timestamp NOT NULL DEFAULT NOW(),
-    update_at timestamp
+    createdAt timestamp NOT NULL DEFAULT NOW(),
+    updatedAt timestamp
 ); 
 
 
 /*
 CREATE OR REPLACE FUNCTION func_role_updater() RETURNS TRIGGER AS $BODY$
     BEGIN
-        UPDATE roles SET update_at = current_timestamp WHERE id = OLD.id;
+        UPDATE roles SET updatedAt = current_timestamp WHERE id = OLD.id;
         RETURN NEW;
     END;
 $BODY$
@@ -300,7 +300,7 @@ DROP TRIGGER IF EXISTS tr_role_updater ON roles;
 
 CREATE OR REPLACE FUNCTION func_resource_updater() RETURNS TRIGGER AS $BODY$
     BEGIN
-        UPDATE sources SET update_at = current_timestamp WHERE id = NEW.id;
+        UPDATE sources SET updatedAt = current_timestamp WHERE id = NEW.id;
         RETURN  NEW;
     END;
 $BODY$
@@ -314,7 +314,7 @@ CREATE TRIGGER tr_resource_updater AFTER UPDATE ON sources
 
 CREATE OR REPLACE FUNCTION func_user_updater() RETURNS TRIGGER AS $BODY$
     BEGIN
-        UPDATE users SET update_at = current_timestamp WHERE id = NEW.id;
+        UPDATE users SET updatedAt = current_timestamp WHERE id = NEW.id;
         RETURN  NEW;
     END;
 $BODY$
@@ -324,27 +324,4 @@ COST 100; -- Estimated execution cost of the function.
 CREATE TRIGGER tr_user_updater AFTER UPDATE ON users
      FOR EACH ROW
   EXECUTE PROCEDURE func_user_updater();
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+*/
\ No newline at end of file
diff --git a/doc/build.sh b/doc/build.sh
index 015e203..cada84b 100644
--- a/doc/build.sh
+++ b/doc/build.sh
@@ -7,4 +7,4 @@ while [ "$1" != "" ]; do
     shift
 done
 
-docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.doc ./doc/.
+docker build --network=host --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.doc ./doc/.
diff --git a/docker-compose.yml b/docker-compose.yml
index a8af412..0be50d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -87,7 +87,7 @@ services:
     restart: unless-stopped
 
   odfe-node1:
-    image: amazon/opendistro-for-elasticsearch:1.3.0
+    image: amazon/opendistro-for-elasticsearch:latest
     container_name: odfe-node1
     environment:
       - cluster.name=odfe-cluster
@@ -125,7 +125,7 @@ services:
     restart: unless-stopped
 
   odfe-node2:
-    image: amazon/opendistro-for-elasticsearch:1.3.0
+    image: amazon/opendistro-for-elasticsearch:latest
     container_name: odfe-node2
     environment:
       - cluster.name=odfe-cluster
@@ -135,6 +135,7 @@ services:
       - bootstrap.memory_lock=true
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
       - network.host=0.0.0.0
+      # - discovery.zen.ping.unicast.hosts=odfe-node1
     ulimits:
       memlock:
         soft: -1
@@ -160,17 +161,51 @@ services:
     restart: unless-stopped
 
   kibana:
-    image: amazon/opendistro-for-elasticsearch-kibana:1.3.0
+    image: amazon/opendistro-for-elasticsearch-kibana:latest
     container_name: odfe-kibana
-    environment:
-      - network.host=0.0.0.0
     ports:
       - 5601:5601
     volumes:
       - ./kibana.yml:/usr/share/kibana/config/kibana.yml
     environment:
+      SERVER_HOST: 0.0.0.0
       ELASTICSEARCH_URL: http://odfe-node1:9200
       ELASTICSEARCH_HOSTS: http://odfe-node1:9200
+    links: 
+      - odfe-node1
+      - odfe-node2
+    networks:
+      - app-network
+    restart: unless-stopped
+  
+  search-api: 
+    image: in-sylva.search.api:latest
+    container_name: in-sylva.search.api
+    ports: 
+      - 9000:9000
+    environment: 
+      PORT: 9000
+      network.host: 0.0.0.0
+      NODE_ENV: production
+
+      DB_HOST: in-sylva.postgres 
+      DB_USERNAME: insylva_admin_pg 
+      DB_PASSWORD: v2kGBDUaGjXK2VuPyf5R64VS 
+      DB_DATABASE: insylva
+      DB_PORT: 5432 
+
+      ELK_HOST: odfe-node1
+      ELK_PORT: 9200
+      ELK_USERNAME: admin 
+      ELK_PASSWORD: InSylva146544
+
+      KEYCLOAK_REALM: in-sylva
+      KEYCLOAK_SERVER_URL: http://localhost:7000/keycloak/auth
+      KEYCLOAK_CLIENT_ID: in-sylva.user.app
+    links: 
+      - postgres
+      - odfe-node1
+      - keycloak
     networks:
       - app-network
     restart: unless-stopped
@@ -235,9 +270,9 @@ services:
       ELK_USERNAME: admin
       ELK_PASSWORD: InSylva146544
 
-      KEYCLOAK_REALM: "in-sylva"
+      KEYCLOAK_REALM: in-sylva
       SERVER_URL: http://keycloak:8080/keycloak/auth
-      CLIENT_ID: "in-sylva.user.app"
+      CLIENT_ID: in-sylva.user.app
 
       PORT: 5000
     ports:
diff --git a/elasticsearch.yml b/elasticsearch.yml
index 786cdaf..b55a479 100644
--- a/elasticsearch.yml
+++ b/elasticsearch.yml
@@ -1,4 +1,4 @@
-# opendistro_security.disabled: true
+# opendistro_security.disabled: false
 opendistro_security.ssl.transport.pemcert_filepath: node.pem
 opendistro_security.ssl.transport.pemkey_filepath: node-key.pem
 opendistro_security.ssl.transport.pemtrustedcas_filepath: root-ca.pem
diff --git a/gatekeeper/build.sh b/gatekeeper/build.sh
index 4ddb87b..ac06443 100644
--- a/gatekeeper/build.sh
+++ b/gatekeeper/build.sh
@@ -7,5 +7,5 @@ while [ "$1" != "" ]; do
     shift
 done
 
-docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.gatekeeper ./gatekeeper/.
+docker build --network=host --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.gatekeeper ./gatekeeper/.
 
diff --git a/keycloak/build.sh b/keycloak/build.sh
index 3d417ff..c56aaa3 100644
--- a/keycloak/build.sh
+++ b/keycloak/build.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker build --tag in-sylva.keycloak ./keycloak/.
+docker build --network=host --tag in-sylva.keycloak ./keycloak/.
 
diff --git a/kibana.yml b/kibana.yml
index dca78a1..ff97e31 100644
--- a/kibana.yml
+++ b/kibana.yml
@@ -1,5 +1,5 @@
 server.name: kibana
-server.host: "0.0.0.0"
+server.host: "0"
 
 opendistro_security.auth.type: "basicauth"
 opendistro_security.basicauth.enabled: false
@@ -9,7 +9,7 @@ opendistro_security.multitenancy.enable_filter: true
 opendistro_security.multitenancy.tenants.enable_global: true
 opendistro_security.multitenancy.tenants.enable_private: true
 
-elasticsearch.hosts: ["http://localhost:9200"]
+elasticsearch.hosts: "http://localhost:9200"
 elasticsearch.ssl.verificationMode: none
 elasticsearch.username: "kibanaserver"
 elasticsearch.password: "InSylva146544"
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
new file mode 100644
index 0000000..dbf6b34
--- /dev/null
+++ b/kibana/Dockerfile
@@ -0,0 +1,3 @@
+FROM amazon/opendistro-for-elasticsearch-kibana:1.6.0
+RUN /usr/share/kibana/bin/kibana-plugin remove opendistro_security
+COPY --chown=kibana:kibana kibana.yml /usr/share/kibana/config/
\ No newline at end of file
diff --git a/kibana/kibana.yml b/kibana/kibana.yml
new file mode 100644
index 0000000..ff97e31
--- /dev/null
+++ b/kibana/kibana.yml
@@ -0,0 +1,19 @@
+server.name: kibana
+server.host: "0"
+
+opendistro_security.auth.type: "basicauth"
+opendistro_security.basicauth.enabled: false
+opendistro_security.multitenancy.enabled: true
+opendistro_security.multitenancy.show_roles: true
+opendistro_security.multitenancy.enable_filter: true
+opendistro_security.multitenancy.tenants.enable_global: true
+opendistro_security.multitenancy.tenants.enable_private: true
+
+elasticsearch.hosts: "http://localhost:9200"
+elasticsearch.ssl.verificationMode: none
+elasticsearch.username: "kibanaserver"
+elasticsearch.password: "InSylva146544"
+elasticsearch.requestHeadersWhitelist: ["securitytenant", "Authorization"]
+
+opendistro_security.multitenancy.tenants.preferred: ["Private", "Global"]
+opendistro_security.readonly_mode.roles: ["kibana_read_only"]
diff --git a/login/build.sh b/login/build.sh
index 8b81754..9d06300 100644
--- a/login/build.sh
+++ b/login/build.sh
@@ -7,7 +7,7 @@ while [ "$1" != "" ]; do
     shift
 done
 
-docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" \
+docker build --network=host --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" \
  --build-arg IN_SYLVA_GATEKEEPER_HOST="0.0.0.0" \
  --build-arg IN_SYLVA_GATEKEEPER_PORT="4000" \
  --build-arg IN_SYLVA_KEYCLOAK_HOST="0.0.0.0" \
diff --git a/node-key.pem b/node-key.pem
index 8c72904..609d074 100644
--- a/node-key.pem
+++ b/node-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDixbR8hMlij9Oi
-bKL2HFgnPyP1/wnLgCbLiDKYFGtsVdiXJ8IWnI1f7YLl1HbXW8XwK0qaGDBKUu2r
-pdvz5I6gILTm2cw2ArZDjhgfFfTEx9+k8LEtjkrc8kSfFUdqj8VnkNmlwnC1/Bs+
-gLJmDt3lQSQCX3aIOIvswYEpYlCJThJ63/vpE+oRa/ip8sUSDx1YySNsNJ+C1ShW
-UBGr33hgQdupNpRV5PQojSD6lGeIAo/TpuLFixeXI5TFSmB/+ZU8lg+oje0MTmev
-Mx8St34tamnFHdzhEayFlSRCxkU6SeRcOM2SGMw2PK9rdlwedlB8zx42mg8DCh0c
-ZawOGD59AgMBAAECggEASXz0Tl3hvTUKyloWPVdWIfHOP4vUqsPuzopmiu4jGcqA
-FAvoU9eL4QhhIQXHNWciMAB3fpRUIeHZ74QiUVlB9xZiSWVPTjl2w1Gq83f0CEkV
-aqgtYqv4Cr3gCwWkTR4mRLemMJdgWzlFwu2F4pjyw7ZmavZwvRhGEAVtS/H2U2gD
-Jl16amADdCSCtUrPUZGkLerseGIvffQkgzikjhgPBKy26LN83h34pLXIdSruUtCh
-vy9+Ekfpyof7gOFf44GbHwElXkKDbrMsw0X7dmuuVJTAp0q0NfrbdESNtoFDQeYh
-3Q58RP5TBR5268n4HcRHJ49iaEVaHQvMJ+qxn5nnwQKBgQD+J1XFv+K5vaFx6x94
-/UUsG1s4GKNDTQUE8sky+mz+QKPJFTBWKDA7hLWoiTl+R1DELM4RUN6TcDxmRXkc
-CMH0h1TH7CTFt2sMveDs4tQTWAZ+ZuaUoHkXN9mpWb35HEr4XHbR99Qp8qN51kjg
-KqnaXvHPESbq+QVyahaf/qvFSQKBgQDka3J66v0wwmXXmukhpaP/83QcOasPf2sY
-3IJ1/AFHIHbnC/SgFbVpROZ5u6/GyB7HoMHBjCGCmozyK90egm74t86kugaIWcAj
-7GTlD8NYUM8QOmx4SnF2k6s1J2MpiF3QEWaAifbQXWA32IYhJEZKb3ZxHkTAvA4N
-5z02gqoTlQKBgGAN+8PWRtlOSzMj2uw+RKNr32jvHt0zwb7iB5rFvOXHBl/cKz2U
-yM3l1UZSPrF0QJk0Gdm/h6+PjrRUc3Zd9Pf3IdrBbBBxxvq01MqS2/ZHoYSqXWE0
-2S8mQ5RWv47j243MXHf0w3HrK0/D5h0a4sEOezN4Vw4deaqJX+2uMbtJAoGAGpff
-1iuxmpGnZbilV8N/GndvlzGnlsBQ6a4SikXyqCNBdJjRvCmK21yoMJgHWO9HlhpD
-NJNp+1ie/DrbHYg1/0L3DfqSdCFu2z/UZ060gX22/b6vjjmsiA+dKS0SwG0d7vF3
-q5NkZtHYN+g/hXBBtrzPX1AU1ROP11KKr+P6hRkCgYEAs45eHTcq6F0PGdd/BFey
-yUszqixiXCPhxBoTj0i+OTcFhdjkJ18Bc+nkMccEI/D3uffw61Klx/kRdg4e2hmx
-lDKEPuxZDcSKk3+7DFUx/IVurS5MU48/maaA4f8VHrrwVGuTQmEc2ZhwnOj6fYK6
-NM8ucT9t4GT/HvIWHbXfNAs=
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDJUB7re6DRNeXF
+T9yaBSK4nmODb5bCa7X8lz2v9/X2VO+wZZivMCqJhPxFgrZc1XoE9l/qtzT1nwS7
+NOMe+5X1J9awTD9viUR+nWoM+KJ5GIhdjkpFEthU4TDdRinQYD+ZLz/Fho5cf4sd
+l2pPOOGHiCZmyOB8OBmqTo3nE6E3qkdr6xA6l8faWADYlNHBoy8xJJNZxazBg81B
+JzgB7SjvGjizfmY3ThM6cXsMDs7Q6P3S15oyNqfr6JELWgWbxJZJAsxv6HKGvycW
+5cWQU6918pb2WfhzmnRcTvN/hS/1udtPhq117DjJjC+nZA6GGLYfOjwoh8UdlbGG
+NiJdbsthAgMBAAECggEAE1iJwCN/TtuZGx8TmhGIRqmh8o2UtVZYhM+b8/8mOefr
+qM36oEtGqzSGcb+f+sfhE/0BNrMoebowYDUy5lVTEd4kOYj6R6OvW2ORP3HdWznK
+UQNNi9nFxFJnubv2ZLn7IqNxw2+s2qK/IbbdVoOm2Llyx0nimM1jWgR2ipBOW+Tr
+mFsMIZUHI9awpMvqlRzJShEQAeYB49hkrRfNqz15UwAvkeVzhou8C7RSXP5rNzPn
+GTejKykbPlnzJ4FRLVKmin2ytXQw7lIrZ/ysZsfmjZHMYs9DKfRlENgDlwO8gum4
+2SI6D9TU9bsKTvMUSOUlXB25i6Hn9NKXlYymW1/v4QKBgQDnRPuGb8OlMtZjTJKI
+dztHZvtSQaP6pBBaz+m9P3EfC06X81kX4HCn03g3CwvapXQOcHYSPNxuACmKGzBP
+5ZbfhxGb0bfQ1RkPQPZpIJwEDn3zz5SqVkG1uxwXzfjKFk/t8Ku7qLVRu+WFXEdW
+WV+TEjkyB6T/2l8pEYrkJsW9jQKBgQDe1xPGvQrmN2gRqHCMZidCUYEM8dc8z7iG
+8yGQbFiSHz4Rqrk00AaH9bbDVzwDyz0Snv9kPLgGZseAf04vD13tgSPJ0DtEBUHd
+3ZLUseE9G4LdqNupmqQlQXhEXEvzI14RWYb/s2hMUyinxg5ceWh7NI0LX7/pVATY
+SEWglIt+JQKBgQCWorDuJNgbPxyzOwnqxzaeUG58anLja3+XlvsZIDyPSu8bPA8Y
+5UCbn7sapyBGfyQzz36obGnrYEGuSf1S3SlDWRfYFWaUKGkVLWwSl4HnhoT1jIy5
+0kskksY+nxNgld3kDrHdHotTvH5IOg3hKX9+LQ2CD8aiO9tlxZ5g8vwzdQKBgQDQ
+qUaMZwHotmMNfdL9tL34PIeBzocEG2Gng8yfBsUc9oJRWrKYAF7NOskLOwkoaEvk
+vttYSf7rh5wx94MHT/Vc6vrPA9wrAl092jeeUH4fkT5GPtKJixM/C4IJSP+ZSTnR
+NyrRDnaQWaIND8js0IaEL54O03bJjnIG8A26or3HvQKBgQDlQBrVJx2lvMRGdfGm
+OmYdDadx0pr+46CopaNwHywPYacedG32yOaP/+bukto4IOdWhc/Sbv9NQDPQIq8v
+qT56dzsTFzEskH/DkvwHv6VcH64XzcnaJ3w68zkt4/hgAPVqACgyaDvleCas+WVb
+8cxNhRON+oK4x+OaS6HRQu3j1Q==
 -----END PRIVATE KEY-----
diff --git a/node.pem b/node.pem
index 6d54a71..cfa07f3 100644
--- a/node.pem
+++ b/node.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDRjCCAi4CFCFrYZBerplClvWabUIF16kVNBRfMA0GCSqGSIb3DQEBCwUAMFsx
+MIIDRjCCAi4CFCFrYZBerplClvWabUIF16kVNBRhMA0GCSqGSIb3DQEBCwUAMFsx
 CzAJBgNVBAYTAkZSMQ0wCwYDVQQIDARQQUNBMRAwDgYDVQQHDAdBVklHTk9OMQ0w
 CwYDVQQKDARJTlJBMRAwDgYDVQQLDAdJTlNZTFZBMQowCAYDVQQDDAFOMB4XDTIw
-MDQxNTEzMjUwMloXDTIwMDUxNTEzMjUwMlowZDELMAkGA1UEBhMCRlIxDTALBgNV
+MDUwMjAxMzI1NVoXDTIwMDYwMTAxMzI1NVowZDELMAkGA1UEBhMCRlIxDTALBgNV
 BAgMBFBBQ0ExEDAOBgNVBAcMB0FWSUdOT04xDTALBgNVBAoMBElOUkExEDAOBgNV
 BAsMB0lOU1lMVkExEzARBgNVBAMMCmluc3lsdmEuZnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDixbR8hMlij9OibKL2HFgnPyP1/wnLgCbLiDKYFGts
-VdiXJ8IWnI1f7YLl1HbXW8XwK0qaGDBKUu2rpdvz5I6gILTm2cw2ArZDjhgfFfTE
-x9+k8LEtjkrc8kSfFUdqj8VnkNmlwnC1/Bs+gLJmDt3lQSQCX3aIOIvswYEpYlCJ
-ThJ63/vpE+oRa/ip8sUSDx1YySNsNJ+C1ShWUBGr33hgQdupNpRV5PQojSD6lGeI
-Ao/TpuLFixeXI5TFSmB/+ZU8lg+oje0MTmevMx8St34tamnFHdzhEayFlSRCxkU6
-SeRcOM2SGMw2PK9rdlwedlB8zx42mg8DCh0cZawOGD59AgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAB7OjIsHq19DA8zQiOHO8X2FaLNS71kG+SN83lNurEibWG7i8JQG
-lh0BbxhabtEER8yQ3gZaPt2fUjEOWme153erJxUSMeci13EXDFkwTpf6QFCnOpoE
-dTyL8Dg6XwajU7vQAdj4Sw8plY2QlVvtjzYYi4YZmLmpZvRfZaHwVD7MTrzf9/yd
-v6iX62Ta8hTDoquOgYOhySmWNUZ38a90BWsmA8bG31JiY+xd+74P2NziZ2adFyp8
-Ed98MqV/AeeQlGPThVjKqp1RtG2WrzyCth59U9mSfQ473VZkF2hrgWQ4zq7Oufap
-vLMuh2XpVW0EGLKSCuO2xWqqR3qthbdu5q4=
+AQUAA4IBDwAwggEKAoIBAQDJUB7re6DRNeXFT9yaBSK4nmODb5bCa7X8lz2v9/X2
+VO+wZZivMCqJhPxFgrZc1XoE9l/qtzT1nwS7NOMe+5X1J9awTD9viUR+nWoM+KJ5
+GIhdjkpFEthU4TDdRinQYD+ZLz/Fho5cf4sdl2pPOOGHiCZmyOB8OBmqTo3nE6E3
+qkdr6xA6l8faWADYlNHBoy8xJJNZxazBg81BJzgB7SjvGjizfmY3ThM6cXsMDs7Q
+6P3S15oyNqfr6JELWgWbxJZJAsxv6HKGvycW5cWQU6918pb2WfhzmnRcTvN/hS/1
+udtPhq117DjJjC+nZA6GGLYfOjwoh8UdlbGGNiJdbsthAgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAFXWTMpG0AIJXFv2r0X7rD0bqyrvMAegMTqkOaauYFRNGSN8Z6SZ
+Gbxm0//54pu4dCTZ01MGpxgO/Ip7Dps6EgJOUbG4wXRH3VZYrYdjdHIjy6UlHgwc
+5zgK+1vokIFzHMHnmXmORSz4APemfs+Mp/GzpEc/S4DI7w3OwB5ZczGGtKIv9Oe/
+t0j6D+qzD6ChlVvWcwYRW5ZWI1emQEUl5P0V+zl9WIu9QoUUzAbMgxzpWhonWiEW
+nr6b65OcoeCDTTA0JSQ6O2btVeq9+4sb8rKMY1imws4kWpv/cA7WZv9J/eklOLWw
+m4Z8m8SD7bm3nq8YJewkTorEWetBTbxVNy8=
 -----END CERTIFICATE-----
diff --git a/portal/build.sh b/portal/build.sh
index 8ce78f8..1f69c6d 100644
--- a/portal/build.sh
+++ b/portal/build.sh
@@ -7,5 +7,5 @@ while [ "$1" != "" ]; do
     shift
 done
 
-docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE"  --tag in-sylva.portal ./portal/.
+docker build --network=host --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE"  --tag in-sylva.portal ./portal/.
 # docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE"  --tag in-sylva.portal .
diff --git a/postgresql/Dockerfile b/postgresql/Dockerfile
index 765b584..6c3af41 100644
--- a/postgresql/Dockerfile
+++ b/postgresql/Dockerfile
@@ -1,2 +1,2 @@
-FROM postgres:9.6
+FROM postgres:latest
 COPY create-multiple-postgresql-databases.sh /docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/root-ca.srl b/root-ca.srl
index cee3110..e06bbb6 100644
--- a/root-ca.srl
+++ b/root-ca.srl
@@ -1 +1 @@
-216B61905EAE994296F59A6D4205D7A91534145F
+216B61905EAE994296F59A6D4205D7A915341461
diff --git a/search.api/Dockerfile b/search.api/Dockerfile
index e69de29..e1d4694 100644
--- a/search.api/Dockerfile
+++ b/search.api/Dockerfile
@@ -0,0 +1,44 @@
+FROM node:latest
+
+RUN apt-get update && \
+    apt-get install -y  git \
+    openssh-server
+
+RUN apt-get update && apt-get install wget && apt-get install telnet -y
+RUN npm install --global pm2
+
+RUN mkdir /var/run/sshd
+EXPOSE 22 
+
+ARG SSH_KEY
+ARG SSH_KEY_PASSPHRASE
+RUN chmod go-w /root
+
+RUN mkdir -p /root/.ssh && \
+    chmod 600 /root/.ssh 
+
+RUN echo "$SSH_KEY" >> /root/.ssh/id_rsa && \
+    echo "$SSH_KEY_PASSPHRASE" >> /root/.ssh/id_rsa.pub 
+
+RUN chmod -R 600 /root/.ssh/id_rsa && \
+    chmod -R 600 /root/.ssh/id_rsa.pub 
+
+RUN ssh-keyscan -Ht rsa forgemia.inra.fr,147.100.164.13 >> ~/.ssh/known_hosts
+
+RUN mkdir /app/ 
+
+WORKDIR /app/
+
+RUN git clone git@forgemia.inra.fr:in-sylva-development/in-sylva.search.git
+
+RUN cd ./in-sylva.search && npm install
+
+ENV NODE_ENV production
+ENV PROCESS_TYPE web
+ENV PORT 9000
+
+EXPOSE 9000
+
+WORKDIR /app/in-sylva.search/
+
+CMD [ "pm2-runtime","--name","in-sylva.search", "npm run start:prod"]
\ No newline at end of file
diff --git a/search.api/build.sh b/search.api/build.sh
new file mode 100644
index 0000000..5b1def0
--- /dev/null
+++ b/search.api/build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+while [ "$1" != "" ]; do
+   SSH_KEY=$(cat ~/.ssh/$1)
+   SSH_KEY_PASSPHRASE=$(cat ~/.ssh/$1.pub)
+    # Shift all the parameters down by one
+    shift
+done
+
+docker build --network=host --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.search.api ./search.api/.
+
diff --git a/search/build.sh b/search/build.sh
index f899027..06f28b5 100644
--- a/search/build.sh
+++ b/search/build.sh
@@ -7,5 +7,5 @@ while [ "$1" != "" ]; do
     shift
 done
 
-docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.search .
+docker build --network=host --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.search ./search/