diff --git a/db-management/clean-all.sh b/db-management/clean-all.sh
old mode 100644
new mode 100755
index b317c727d048facf09da71ecd7ec6abb851567e4..e75e9287f2641b56ef059776dd8621132d04e440
--- a/db-management/clean-all.sh
+++ b/db-management/clean-all.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-docker exec -i hr psql -u root -p'123' airports-hr-service < ./db-management/clean/clean-hr-service.sql
-docker exec -i hr psql -u root -p'123' airports-service < ./db-management/clean/clean-airports-service.sql
-docker exec -i hr psql -u root -p'123' airports-flights-service < ./db-management/clean/clean-flights-service.sql
-docker exec -i hr psql -u root -p'123' airports-planes-service < ./db-management/clean/clean-planes-service.sql
\ No newline at end of file
+cat ./db-management/clean/clean-hr-service.sql | docker-compose exec -T hr-service-db psql -U postgres -d hr -p 5432
+cat ./db-management/clean/clean-airports-service.sql | docker-compose exec -T airports-service-db psql -U postgres -d airports -p 5432
+#cat ./db-management/clean/clean-flights-service.sql | docker-compose exec -T flights-service-db psql -U postgres -d flights -p 5432
+cat ./db-management/clean/clean-planes-service.sql | docker-compose exec -T planes-service-db psql -U postgres -d planes   -p 5432
\ No newline at end of file
diff --git a/db-management/clean/clean-airports-service.sql b/db-management/clean/clean-airports-service.sql
index 74ca08eb9220d773a3e844387874dc5cc6a2efc1..c6a9c0ac35f0180d712479225cdb9282bd86dc30 100644
--- a/db-management/clean/clean-airports-service.sql
+++ b/db-management/clean/clean-airports-service.sql
@@ -1 +1,3 @@
-DELETE * FROM airport;
\ No newline at end of file
+SET search_path TO airport;
+
+DELETE FROM airport;
\ No newline at end of file
diff --git a/db-management/clean/clean-flights-service.sql b/db-management/clean/clean-flights-service.sql
index ad36a4e3cd6039a47381a1fccb85b2b0b22e46f7..fb433d67862c73e45ca030da25da8f98a801ea11 100644
--- a/db-management/clean/clean-flights-service.sql
+++ b/db-management/clean/clean-flights-service.sql
@@ -1,3 +1,4 @@
-DELETE * FROM flight;
-DELETE * FROM flightrealization;
-DELETE * FROM issue;
\ No newline at end of file
+
+DELETE FROM flight;
+DELETE FROM flightrealization;
+DELETE FROM issue;
\ No newline at end of file
diff --git a/db-management/clean/clean-hr-service.sql b/db-management/clean/clean-hr-service.sql
index d49c71901188f8f22e2186864101d59f44db92a8..aef15f2934fa4ced0e7b484ddad240f2bb53e2a6 100644
--- a/db-management/clean/clean-hr-service.sql
+++ b/db-management/clean/clean-hr-service.sql
@@ -1,5 +1,7 @@
-DELETE * FROM language;
-DELETE * FROM pilot_licence;
-DELETE * FROM steward;
-DELETE * FROM pilot;
-DELETE * FROM employee;
\ No newline at end of file
+SET search_path TO hr;
+
+DELETE FROM language;
+DELETE FROM pilot_licence;
+DELETE FROM stewards;
+DELETE FROM pilots;
+DELETE FROM employee;
\ No newline at end of file
diff --git a/db-management/clean/clean-planes-service.sql b/db-management/clean/clean-planes-service.sql
index 81a0b1735a11e3a9980813657bd0270f6fa666e9..be176c35a3f87fd97cc8f1b62c3d5024c7cef3b1 100644
--- a/db-management/clean/clean-planes-service.sql
+++ b/db-management/clean/clean-planes-service.sql
@@ -1 +1,3 @@
-DELETE * FROM plane;
\ No newline at end of file
+SET search_path TO planes;
+
+DELETE FROM plane;
\ No newline at end of file