diff --git a/dist/setup.sh b/dist/setup.sh
index 3b67a3f..047e481 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -444,7 +444,7 @@ install_docker() {
 
   if [[ $DOCKER_MODE == 'swarm' && $noSwarm == 1 ]]; then
     step "     init docker swarm"
-    try docker swarm init > /dev/null 2>&1
+    try docker swarm init --task-history-limit 1 > /dev/null 2>&1
     next
   fi
 
@@ -454,7 +454,7 @@ install_docker() {
     if [[ $net_entry =~ 'local' && $DOCKER_MODE == 'swarm' ]]; then
       step " recreate cyphernode network"
       try docker network rm cyphernodenet > /dev/null 2>&1
-      try docker network create -d overlay cyphernodenet > /dev/null 2>&1
+      try docker network create -d overlay --attachable --opt encrypted cyphernodenet > /dev/null 2>&1
       next
     elif [[ $net_entry =~ 'swarm' && $DOCKER_MODE == 'compose' ]]; then
       step " recreate cyphernode network"
@@ -465,7 +465,7 @@ install_docker() {
   else
     if [[ $DOCKER_MODE == 'swarm' ]]; then
       step "   create cyphernode network"
-      try docker network create -d overlay cyphernodenet > /dev/null 2>&1
+      try docker network create -d overlay --attachable --opt encrypted cyphernodenet > /dev/null 2>&1
       next
     elif [[ $DOCKER_MODE == 'compose' ]]; then
       step "   create cyphernode network"