diff --git a/docker/Makefile b/docker/Makefile
index 1dd609b..408a52f 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,6 +1,6 @@
 # Targets for building/running/stopping the blockchain and rendezvous server (using the docker-compose file)
 build:
-	@docker-compose -f ./docker-compose.yml -p concordia build;
+	@docker-compose -f ./docker-compose.yml -p concordia build
 run:
 	@docker-compose -f ./docker-compose.yml -p concordia up -d
 stop:
@@ -10,15 +10,18 @@ stop-clean-data:
 
 # Ganache targets
 build-ganache:
-	@docker build . -f ./ganache/Dockerfile -t concordia-ganache
+	@docker build ../ -f ./ganache/Dockerfile -t concordia-ganache
 run-ganache:
-	@docker-compose -f ./ganache/docker-compose.yml -p concordia up -d
+	@docker network create --driver bridge concordia_ganache_network || true &&\
+	docker run -d -v `pwd`/volumes/ganache_db:/home/ganache_db -v `pwd`/volumes/ganache_keys:/home/ganache_keys -p 8545:8545 --env-file=./env/ganache.env --name concordia-ganache --net=concordia_ganache_network concordia-ganache:latest
 run-ganache-test:
-	@docker-compose -f ./ganache/docker-compose.test.yml -p concordia up -d
+	@docker network create --driver bridge concordia_ganache_test_network || true &&\
+	docker run --rm -d -p 8546:8546 --env-file=./env/ganache.test.env --name concordia-ganache-test --net=concordia_ganache_test_network concordia-ganache:latest
 
 # Rendezvous targets
 run-rendezvous:
-	@docker-compose -f ./rendezvous/docker-compose.yml -p concordia up -d
+	@docker network create --driver bridge concordia_rendezvous_network || true &&\
+	docker run -d -p 9090:9090 --name concordia-rendezvous libp2p/js-libp2p-webrtc-star:version-0.20.1
 
 # Contracts targets
 build-contracts:
@@ -28,12 +31,12 @@ build-contracts-migrate:
 build-contracts-tests:
 	@docker build ../ -f ./concordia-contracts/Dockerfile --target test -t concordia-contracts-tests --build-arg TZ=Europe/Athens
 run-contract-tests:
-	@docker run --rm -v `pwd`/reports/contracts/:/usr/test-reports/ --env-file=./env/contracts.env --net=concordia_ganache-test-network concordia-contracts-tests:latest
+	@docker run --rm -v `pwd`/reports/contracts/:/usr/test-reports/ --env-file=./env/contracts.docker.env --net=concordia_ganache_test_network concordia-contracts-tests:latest
 run-contract-tests-host-chain:
 	@docker run --rm -v `pwd`/reports/contracts/:/usr/test-reports/ --env-file=./env/contracts.env --net=host concordia-contracts-tests:latest
 run-contracts-migrate:
 	@cd .. &&\
-	docker run --rm -v `pwd`/packages/concordia-contracts/build/:/usr/src/concordia/packages/concordia-contracts/build/ --env-file=./docker/env/contracts.docker.env --net=concordia_ganache-network concordia-contracts-migrate:latest
+	docker run --rm -v `pwd`/packages/concordia-contracts/build/:/usr/src/concordia/packages/concordia-contracts/build/ --env-file=./docker/env/contracts.docker.env --net=concordia_ganache_network concordia-contracts-migrate:latest
 run-contracts-migrate-host-chain:
 	@cd .. &&\
 	docker run --rm -v `pwd`/packages/concordia-contracts/build/:/usr/src/concordia/packages/concordia-contracts/build/ --env-file=./docker/env/contracts.env --net=host concordia-contracts-migrate:latest
@@ -47,10 +50,10 @@ build-app:
 build-app-tests:
 	@docker build ../ -f ./concordia-app/Dockerfile --target test -t concordia-app-tests --build-arg TZ=Europe/Athens
 run-app-tests:
-	@docker run --rm -v `pwd`/reports/app/:/usr/test-reports/ --env-file=./env/concordia.env concordia-app-tests:latest
+	@docker run --rm -v `pwd`/reports/app/:/usr/test-reports/ --env-file=./env/concordia.docker.env concordia-app-tests:latest
 run-app:
-	@docker create --env-file=./env/concordia.docker.env -p 8473:80 --name concordia-app --net=concordia_ganache-network concordia-app:latest &&\
-	docker network connect concordia_rendezvous-network concordia-app &&\
+	@docker create --env-file=./env/concordia.docker.env -p 8473:80 --name concordia-app --net=concordia_ganache_network concordia-app:latest &&\
+	docker network connect concordia_rendezvous_network concordia-app &&\
 	docker start concordia-app
 run-app-host-chain:
 	@docker run -d --env-file=./env/concordia.env --name concordia-app --net=host concordia-app:latest
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a7044bb..542be1c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,8 +2,13 @@ version: '3.8'
 
 services:
   ganache:
-    build: ganache
-    container_name: ganache
+    build:
+      context: ../
+      dockerfile: ./docker/ganache/Dockerfile
+    image: concordia-ganache
+    container_name: concordia-ganache
+    env_file:
+      - env/ganache.env
     expose:
       - 8545
     ports:
@@ -13,18 +18,18 @@ services:
       - ./ganache/volumes/ganache_db:/home/ganache_db
       - ./ganache/volumes/ganache_keys:/home/ganache_keys
     networks:
-      ganache-network:
+      ganache_network:
     restart: always
 
   rendezvous:
     image: libp2p/js-libp2p-webrtc-star:version-0.20.1
-    container_name: rendezvous
+    container_name: concordia-rendezvous
     networks:
-      rendezvous-network:
+      rendezvous_network:
     ports:
       - 9090:9090
     restart: always
 
 networks:
-  ganache-network:
-  rendezvous-network:
+  ganache_network:
+  rendezvous_network: