diff --git a/database/database.go b/database/database.go
index 75f4802..63125f6 100644
--- a/database/database.go
+++ b/database/database.go
@@ -56,6 +56,9 @@
 	case "redis":
 		database.kvc, err = kvstore.NewRedisClient(address, time.Duration(timeout), false)
 		return &database, err
+	case "etcd":
+		database.kvc, err = kvstore.NewEtcdClient(ctx, address, time.Duration(timeout), log.ErrorLevel)
+		return &database, err
 	}
 	return &database, errors.New("unsupported-kv-store")
 }
@@ -1061,14 +1064,15 @@
 	logger.Infow(ctx, "Deleting all the Update Vnet Requests for device", log.Fields{"device": deviceID})
 	return nil
 }
+
 // PutOltFlowService to add OltFlowService info
 func (db *Database) PutOltFlowService(ctx context.Context, value string) error {
 	key := GetKeyPath(OltFlowServicePath)
 
-        if err := db.kvc.Put(ctx, key, value); err != nil {
-                logger.Warnw(ctx, "Put OltFlowService failed", log.Fields{"key": key})
+	if err := db.kvc.Put(ctx, key, value); err != nil {
+		logger.Warnw(ctx, "Put OltFlowService failed", log.Fields{"key": key})
 		return err
-        }
+	}
 	return nil
 }