diff --git a/Dockerfile b/Dockerfile
index da5db301..86692706 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,7 +55,7 @@ ENV TB_ROOT_PATH=/app \
     TB_SQLITE_USER=cb_tumblebug \
     TB_SQLITE_PASSWORD=cb_tumblebug \
     TB_ETCD_ENDPOINTS=http://etcd:2379 \
-    TB_ETCD_AUTH_ENABLED=true \
+    TB_ETCD_AUTH_ENABLED=false \
     TB_ETCD_USERNAME=default \
     TB_ETCD_PASSWORD=default \
     TB_ALLOW_ORIGINS=* \
diff --git a/conf/setup.env b/conf/setup.env
index 5439f466..f7670c45 100644
--- a/conf/setup.env
+++ b/conf/setup.env
@@ -31,7 +31,7 @@ export TB_SQLITE_PASSWORD=cb_tumblebug
 
 ## Set etcd cluster
 export TB_ETCD_ENDPOINTS=http://localhost:2379
-export TB_ETCD_AUTH_ENABLED=true
+export TB_ETCD_AUTH_ENABLED=false
 export TB_ETCD_USERNAME=default
 export TB_ETCD_PASSWORD=default
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 93e74d2d..3842e405 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -34,7 +34,7 @@ services:
       - TB_SPIDER_REST_URL=http://cb-spider:1024/spider
       - TB_ETCD_ENDPOINTS=http://cb-tumblebug-etcd:2379
       - TB_TERRARIUM_REST_URL=http://mc-terrarium:8055/terrarium
-      # - TB_ETCD_AUTH_ENABLED=true
+      # - TB_ETCD_AUTH_ENABLED=false
       # - TB_ETCD_USERNAME=default
       # - TB_ETCD_PASSWORD=default
       # - TB_SQLITE_URL=localhost:3306 
diff --git a/src/core/infra/provisioning.go b/src/core/infra/provisioning.go
index c6cba835..ad8f14fb 100644
--- a/src/core/infra/provisioning.go
+++ b/src/core/infra/provisioning.go
@@ -30,6 +30,7 @@ import (
 	validator "github.com/go-playground/validator/v10"
 	"github.com/go-resty/resty/v2"
 	"github.com/rs/zerolog/log"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"golang.org/x/net/context"
 )
 
@@ -957,6 +958,20 @@ func CreateMciDynamic(reqID string, nsId string, req *model.TbMciDynamicReq, dep
 		return emptyMci, err
 	}
 
+	// Create a persistent session for distributed lock
+	ctx := context.TODO()
+	session, err := kvstore.NewSession(ctx)
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to create a session for dist-lock")
+	}
+	defer func() {
+		err := session.Close()
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to close a session for dist-lock")
+		}
+	}()
+	log.Debug().Msgf("Created a session for dist-lock: %v", session)
+
 	//If not, generate default resources dynamically.
 	// Parallel processing of VM requests
 	var wg sync.WaitGroup
@@ -970,7 +985,8 @@ func CreateMciDynamic(reqID string, nsId string, req *model.TbMciDynamicReq, dep
 		go func(vmReq model.TbVmDynamicReq) {
 			defer wg.Done()
 
-			req, err := getVmReqFromDynamicReq(reqID, nsId, &vmReq)
+			req, err := getVmReqFromDynamicReq(ctx, session, reqID, nsId, &vmReq)
+			// req, err := getVmReqFromDynamicReq(reqID, nsId, &vmReq)
 			if err != nil {
 				log.Error().Err(err).Msg("Failed to prepare resources for dynamic MCI creation")
 				errChan <- err
@@ -1036,7 +1052,9 @@ func CreateMciVmDynamic(nsId string, mciId string, req *model.TbVmDynamicReq) (*
 		return emptyMci, err
 	}
 
-	vmReq, err := getVmReqFromDynamicReq("", nsId, req)
+	ctx := context.TODO()
+
+	vmReq, err := getVmReqFromDynamicReq(ctx, nil, "", nsId, req)
 	if err != nil {
 		log.Error().Err(err).Msg("")
 		return emptyMci, err
@@ -1093,7 +1111,7 @@ func checkCommonResAvailableForVmDynamicReq(req *model.TbVmDynamicReq, nsId stri
 }
 
 // getVmReqForDynamicMci is func to getVmReqFromDynamicReq
-func getVmReqFromDynamicReq(reqID string, nsId string, req *model.TbVmDynamicReq) (*model.TbVmReq, error) {
+func getVmReqFromDynamicReq(ctx context.Context, session *concurrency.Session, reqID string, nsId string, req *model.TbVmDynamicReq) (*model.TbVmReq, error) {
 
 	onDemand := true
 
@@ -1146,36 +1164,32 @@ func getVmReqFromDynamicReq(reqID string, nsId string, req *model.TbVmDynamicReq
 	 * - Use distributed-lock, considering running multiple cb-tumblebugs.
 	 */
 
-	// Generate a resource key for vNet
-	vNetKey := common.GenResourceKey(nsId, model.StrVNet, resourceName)
+	var lock *concurrency.Mutex
+	if session != nil {
+		// Generate a resource key for vNet
+		vNetKey := common.GenResourceKey(nsId, model.StrVNet, resourceName)
+		lockKey := "/dist-lock/" + vNetKey
 
-	// Create a persistent session
-	ctx := context.TODO()
-	session, err := kvstore.NewSession(ctx)
-	if err != nil {
-		log.Error().Err(err).Msg("Failed to create etcd session")
-	}
-	defer func() {
-		if err := session.Close(); err != nil {
-			log.Error().Err(err).Msg("Failed to close etcd session")
+		lock, err = kvstore.NewLock(ctx, session, lockKey)
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to get a dist-lock")
 		}
-	}()
+		log.Debug().Msgf("Created a dist-lock: %v", lock)
 
-	lock, err := kvstore.NewLock(ctx, session, vNetKey)
-	if err != nil {
-		log.Error().Err(err).Msg("Failed to get lock")
-	}
-	// Lock
-	err = lock.Lock(ctx)
-	if err != nil {
-		log.Error().Err(err).Msg("Failed to acquire lock")
-	}
-	// Ensure the lock is released when the function exits
-	defer func() {
-		if err := lock.Unlock(ctx); err != nil {
-			log.Error().Err(err).Msg("Failed to release lock")
+		// Lock
+		err = lock.Lock(ctx)
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to acquire a dist-lock")
 		}
-	}()
+		// Unlock the lock when the function exits
+		defer func() {
+			err := lock.Unlock(ctx)
+			if err != nil {
+				log.Error().Err(err).Msg("Failed to release a dist-lock")
+			}
+		}()
+		log.Debug().Msgf("Acquired a dist-lock: %v", lock)
+	}
 
 	common.UpdateRequestProgress(reqID, common.ProgressInfo{Title: "Setting vNet:" + resourceName, Time: time.Now()})
 
@@ -1200,10 +1214,13 @@ func getVmReqFromDynamicReq(reqID string, nsId string, req *model.TbVmDynamicReq
 	}
 	vmReq.SubnetId = resourceName
 
-	// Unlock the lock
-	err = lock.Unlock(ctx)
-	if err != nil {
-		log.Error().Err(err).Msg("Failed to release lock")
+	if session != nil {
+		// Unlock the lock
+		err := lock.Unlock(ctx)
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to release the dist-lock")
+		}
+		log.Debug().Msgf("Released the dist-lock: %v", lock)
 	}
 
 	common.UpdateRequestProgress(reqID, common.ProgressInfo{Title: "Setting SSHKey:" + resourceName, Time: time.Now()})