diff --git a/cmd/controller/app/database/mongodb/task.go b/cmd/controller/app/database/mongodb/task.go
index e379c01b8..a95e30556 100644
--- a/cmd/controller/app/database/mongodb/task.go
+++ b/cmd/controller/app/database/mongodb/task.go
@@ -46,6 +46,8 @@ func (db *MongoService) CreateTasks(tasks []objects.Task, dirty bool) error {
 		// TODO: implement this
 	}()
 
+	var updates []mongo.WriteModel
+
 	for _, task := range tasks {
 		cfgData, err := json.Marshal(&task.JobConfig)
 		if err != nil {
@@ -69,19 +71,15 @@ func (db *MongoService) CreateTasks(tasks []objects.Task, dirty bool) error {
 		}
 		zap.S().Debugf("taskID %s is assigned compute %s", task.TaskId, task.ComputeId)
 
-		after := options.After
-		upsert := true
-		opts := options.FindOneAndUpdateOptions{
-			ReturnDocument: &after,
-			Upsert:         &upsert,
-		}
+		updateModel := mongo.NewUpdateOneModel().SetFilter(filter).SetUpdate(update).SetUpsert(true)
+		updates = append(updates, updateModel)
+	}
 
-		var updatedDoc bson.M
-		err = db.taskCollection.FindOneAndUpdate(context.TODO(), filter, update, &opts).Decode(&updatedDoc)
-		if err != nil {
-			zap.S().Errorf("Failed to insert a task: %v", err)
-			return err
-		}
+	opts := options.BulkWriteOptions{}
+	_, err := db.taskCollection.BulkWrite(context.TODO(), updates, &opts)
+	if err != nil {
+		zap.S().Errorf("Failed to insert tasks: %v", err)
+		return err
 	}
 
 	success = true
diff --git a/fiab/helm-chart/control/values.yaml b/fiab/helm-chart/control/values.yaml
index c6cbf960b..58881d97e 100644
--- a/fiab/helm-chart/control/values.yaml
+++ b/fiab/helm-chart/control/values.yaml
@@ -84,6 +84,10 @@ ingress:
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
     cert-manager.io/cluster-issuer: selfsigned
+    nginx.ingress.kubernetes.io/proxy-body-size: "512m"
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: "60000"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "60000"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "60000"
   annotationsGrpc:
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/backend-protocol: "GRPC"