diff --git a/first-network/byfn.sh b/first-network/byfn.sh
index 4c582e4d69..6cf2079329 100755
--- a/first-network/byfn.sh
+++ b/first-network/byfn.sh
@@ -235,8 +235,7 @@ function upgradeNetwork () {
 # Tear down running network
 function networkDown () {
   # stop org3 containers also in addition to org1 and org2, in case we were running sample to add org3
-  docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH -f $COMPOSE_FILE_ORG3 down --volumes
-  docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_ORG3 down --volumes
+  docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH -f $COMPOSE_FILE_ORG3 down --volumes --remove-orphans
 
   # Don't remove the generated artifacts -- note, the ledgers are always removed
   if [ "$MODE" != "restart" ]; then
diff --git a/first-network/eyfn.sh b/first-network/eyfn.sh
index 7447388864..cee408b829 100755
--- a/first-network/eyfn.sh
+++ b/first-network/eyfn.sh
@@ -136,8 +136,7 @@ function networkUp () {
 
 # Tear down running network
 function networkDown () {
-  docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_ORG3 down --volumes
-  docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_ORG3 -f $COMPOSE_FILE_COUCH down --volumes
+  docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_ORG3 -f $COMPOSE_FILE_COUCH down --volumes --remove-orphans
   # Don't remove containers, images, etc if restarting
   if [ "$MODE" != "restart" ]; then
     #Cleanup the chaincode containers
@@ -149,10 +148,6 @@ function networkDown () {
     # remove the docker-compose yaml file that was customized to the example
     rm -f docker-compose-e2e.yaml
   fi
-
-  # For some black-magic reason the first docker-compose down does not actually cleanup the volumes
-  docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_ORG3 down --volumes
-  docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_ORG3 -f $COMPOSE_FILE_COUCH down --volumes
 }
 
 # Use the CLI container to create the configuration transaction needed to add