diff --git a/.junit/hosts b/.junit/hosts
deleted file mode 100644
index 16352ce832d31857ba1a0f4f5288f46272bffd36..0000000000000000000000000000000000000000
--- a/.junit/hosts
+++ /dev/null
@@ -1,10 +0,0 @@
-###########################################################
-#                PLACE IN /etc/hosts                      #
-###########################################################
-
-172.30.0.5	dbrepo-userdb-u01
-172.30.0.6	dbrepo-userdb-u02
-172.30.0.7	dbrepo-userdb-u03
-172.30.0.8	dbrepo-userdb-u04
-172.31.0.2	dbrepo-broker-service
-172.31.0.3	dbrepo-search-db
\ No newline at end of file
diff --git a/.junit/teardown b/.scripts/teardown.sh
similarity index 96%
rename from .junit/teardown
rename to .scripts/teardown.sh
index 6e818f5ad3acd1eb58002c9c8851b932b159c7c7..9b7926d521d7c9c96eeb4689c86120b220f24775 100755
--- a/.junit/teardown
+++ b/.scripts/teardown.sh
@@ -12,7 +12,6 @@ echo "=== [ Removing * ] ==="
 docker container rm $(docker container ls -aq -f name=.*-service) || true
 docker container rm ui ui-proxy metadata-db || true
 docker volume rm $(docker volume ls -q) || true
-docker network rm core public userdb || true
 echo "=== [ Stopping fda-* ] ==="
 docker container stop $(docker container ls -aq -f name=^/fda-.*) || true
 echo "=== [ Removing fda-* ] ==="
diff --git a/Makefile b/Makefile
index ed8f632caa60f739d7fe922ab0febd6fb8f01d0f..b0ee184762aabe538df9c00c76d91f81da0ffd8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean all
+.PHONY: all
 
 TAG ?= latest
 TRIVY_VERSION ?= v0.41.0
@@ -137,27 +137,27 @@ release-metadata: tag-metadata
 
 test-backend: test-container-service test-database-service test-query-service test-table-service test-identifier-service test-metadata-service test-semantics-service test-analyse-service test-user-service
 
-test-identifier-service: clean build-metadata-db build-identifier-service
+test-identifier-service: build-metadata-db build-identifier-service
 	mvn -f ./dbrepo-identifier-service/pom.xml clean test verify
 
-test-container-service: clean build-metadata-db build-container-service
+test-container-service: build-metadata-db build-container-service
 	mvn -f ./dbrepo-container-service/pom.xml clean test verify
 
-test-database-service: clean build-metadata-db build-database-service
+test-database-service: build-metadata-db build-database-service
 	docker pull rabbitmq:3-management-alpine
 	docker pull elasticsearch:8.7.1
 	mvn -f ./dbrepo-database-service/pom.xml clean test verify
 
-test-query-service: clean build-metadata-db build-query-service
+test-query-service: build-metadata-db build-query-service
 	mvn -f ./dbrepo-query-service/pom.xml clean test verify
 
-test-table-service: clean build-metadata-db build-table-service
+test-table-service: build-metadata-db build-table-service
 	mvn -f ./dbrepo-table-service/pom.xml clean test verify
 
-test-metadata-service: clean build-metadata-db build-metadata-service
+test-metadata-service: build-metadata-db build-metadata-service
 	mvn -f ./dbrepo-metadata-service/pom.xml clean test verify
 
-test-user-service: clean build-metadata-db build-user-service
+test-user-service: build-metadata-db build-user-service
 	mvn -f ./dbrepo-user-service/pom.xml clean test verify
 
 test-semantics-service: clean build-metadata-db build-semantics-service
@@ -248,18 +248,15 @@ scan-user-service:
 coverage-frontend: build-frontend
 	yarn --cwd ./dbrepo-ui run coverage || true
 
-test-frontend: clean build-frontend
+test-frontend: build-frontend
 	yarn --cwd ./dbrepo-ui install
 	yarn --cwd ./dbrepo-ui run test:unit || true
 	yarn --cwd ./dbrepo-ui run coverage || true
 
-clean:
-	docker system prune -f --volumes
-
 test-clients:
 	bash ./.gitlab/test.sh
 
 test: test-backend test-frontend
 
 teardown:
-	./.junit/teardown
+	./.scripts/teardown.sh