diff --git a/pkg/pipeline/CiCdPipelineOrchestrator.go b/pkg/pipeline/CiCdPipelineOrchestrator.go
index 6be1e14ab0..3916ec29b2 100644
--- a/pkg/pipeline/CiCdPipelineOrchestrator.go
+++ b/pkg/pipeline/CiCdPipelineOrchestrator.go
@@ -1442,14 +1442,16 @@ func (impl CiCdPipelineOrchestratorImpl) CreateMaterials(createMaterialRequest *
 		}
 		materials = append(materials, inputMaterial)
 	}
-	err = impl.addRepositoryToGitSensor(materials, "")
+	// moving transaction before addRepositoryToGitSensor as commiting transaction after addRepositoryToGitSensor was causing problems
+	// in case request was cancelled data was getting saved in git sensor but not getting saved in orchestrator db. Same is done in update flow.
+	err = impl.transactionManager.CommitTx(tx)
 	if err != nil {
-		impl.logger.Errorw("error in updating to sensor", "err", err)
+		impl.logger.Errorw("error in committing tx Create material", "err", err, "materials", materials)
 		return nil, err
 	}
-	err = impl.transactionManager.CommitTx(tx)
+	err = impl.addRepositoryToGitSensor(materials, "")
 	if err != nil {
-		impl.logger.Errorw("error in committing tx Create material", "err", err, "materials", materials)
+		impl.logger.Errorw("error in updating to sensor", "err", err)
 		return nil, err
 	}
 	impl.logger.Debugw("all materials are ", "materials", materials)
@@ -1467,6 +1469,11 @@ func (impl CiCdPipelineOrchestratorImpl) UpdateMaterial(updateMaterialDTO *bean.
 		impl.logger.Errorw("err", "err", err)
 		return nil, err
 	}
+	err = impl.transactionManager.CommitTx(tx)
+	if err != nil {
+		impl.logger.Errorw("error in committing tx Create material", "err", err)
+		return nil, err
+	}
 
 	err = impl.updateRepositoryToGitSensor(updatedMaterial, "",
 		updateMaterialDTO.Material.CreateBackup)
@@ -1474,11 +1481,6 @@ func (impl CiCdPipelineOrchestratorImpl) UpdateMaterial(updateMaterialDTO *bean.
 		impl.logger.Errorw("error in updating to git-sensor", "err", err)
 		return nil, err
 	}
-	err = impl.transactionManager.CommitTx(tx)
-	if err != nil {
-		impl.logger.Errorw("error in committing tx Update material", "err", err)
-		return nil, err
-	}
 	return updateMaterialDTO, nil
 }
 
diff --git a/wire_gen.go b/wire_gen.go
index 21e1dace90..eea3340ef4 100644
--- a/wire_gen.go
+++ b/wire_gen.go
@@ -1,6 +1,6 @@
 // Code generated by Wire. DO NOT EDIT.
 
-//go:generate go run github.com/google/wire/cmd/wire
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
 //go:build !wireinject
 // +build !wireinject