diff --git a/internal/cron/cron.go b/internal/cron/cron.go
index df6b458..e4d64bb 100644
--- a/internal/cron/cron.go
+++ b/internal/cron/cron.go
@@ -111,7 +111,7 @@ func updatingSevForEachInc(logger *zap.Logger, incidents []incident.IncidentEnti
 	s := action.NewIncidentChannelMessageUpdateAction(socketModeClient, logger, incidentService, teamService, severityService)
 	s.ProcessAction(incidents[i].SlackChannel)
 
-	msgOption := slack.MsgOptionText(fmt.Sprintf("hoston escalated incident to %s", severityString), false)
+	msgOption := slack.MsgOptionText(fmt.Sprintf("houston escalated incident to %s", severityString), false)
 	_, _, errMessage := socketModeClient.PostMessage(incidents[i].SlackChannel, msgOption)
 	if errMessage != nil {
 		logger.Error("PostMessage failed for cronJob ", zap.Error(errMessage), zap.Int("incidentId", int(incidents[i].ID)))
diff --git a/internal/processor/action/start_incident_modal_submission_action.go b/internal/processor/action/start_incident_modal_submission_action.go
index 474609e..3ee5adb 100644
--- a/internal/processor/action/start_incident_modal_submission_action.go
+++ b/internal/processor/action/start_incident_modal_submission_action.go
@@ -66,7 +66,7 @@ func (cip *CreateIncidentAction) CreateIncidentModalCommandProcessing(callback s
 
 	go func() {
 		// Post incident summary to Blaze Group channel and incident channel
-		timestamp, err := cip.postIncidentSummary(callback.View.PrivateMetadata, *channelID, incidentEntity, teamEntity,
+		_, err := cip.postIncidentSummary(callback.View.PrivateMetadata, *channelID, incidentEntity, teamEntity,
 			severityEntity, incidentStatusEntity)
 		if err != nil {
 			cip.logger.Error("[CIP] error while posting incident summary", zap.Error(err))
@@ -81,8 +81,7 @@ func (cip *CreateIncidentAction) CreateIncidentModalCommandProcessing(callback s
 		}
 
 		if len(strings.TrimSpace(teamEntity.OncallHandle)) > 0 {
-		cip.tagOncallToIncident(int(incidentEntity.TeamId), *channelID)
-		cip.InviteOnCallPersonToIncident(*channelID, *timestamp)
+			cip.tagOncallToIncident(int(incidentEntity.TeamId), *channelID)
 		}
 	}()
 
diff --git a/model/severity/severity.go b/model/severity/severity.go
index 03c0abf..2eb8df8 100644
--- a/model/severity/severity.go
+++ b/model/severity/severity.go
@@ -19,7 +19,7 @@ func NewSeverityRepository(logger *zap.Logger, gormClient *gorm.DB) *Repository
 
 func (r *Repository) GetAllActiveSeverity() (*[]SeverityEntity, error) {
 	var severityEntity []SeverityEntity
-	result := r.gormClient.Where("deleted_at is NULL").Find(&severityEntity)
+	result := r.gormClient.Where("deleted_at is NULL").Order("id asc").Find(&severityEntity)
 	if result.Error != nil {
 		r.logger.Error("fetching severity query failed", zap.Error(result.Error))
 		return nil, result.Error
@@ -61,10 +61,10 @@ func (s *Repository) FindSeverityById(severityId uint) (*SeverityEntity, error)
 	return &severityEntity, nil
 }
 
-func (s *Repository) Update(severityEntity *SeverityEntity) (error) {
+func (s *Repository) Update(severityEntity *SeverityEntity) error {
 	result := s.gormClient.Updates(severityEntity)
 	if result.Error != nil {
 		return result.Error
 	}
 	return nil
-}
\ No newline at end of file
+}
diff --git a/model/team/team.go b/model/team/team.go
index 6b699d1..971c8bb 100644
--- a/model/team/team.go
+++ b/model/team/team.go
@@ -20,7 +20,7 @@ func NewTeamRepository(logger *zap.Logger, gormClient *gorm.DB) *Repository {
 func (r *Repository) GetAllActiveTeams() (*[]TeamEntity, error) {
 	var teamEntity []TeamEntity
 
-	result := r.gormClient.Find(&teamEntity, "active = ?", true)
+	result := r.gormClient.Order("name asc").Find(&teamEntity, "active = ?", true)
 	if result.Error != nil {
 		return nil, result.Error
 	} else if result.RowsAffected == 0 {
@@ -48,4 +48,4 @@ func (r *Repository) UpdateTeam(teamEntity *TeamEntity) error {
 		return result.Error
 	}
 	return nil
-}
\ No newline at end of file
+}
diff --git a/service/severity_service.go b/service/severity_service.go
index 5fe6b4e..10ce74b 100644
--- a/service/severity_service.go
+++ b/service/severity_service.go
@@ -85,7 +85,7 @@ func (s *severityService) GetSeverities(c *gin.Context) {
 			Description:  severity.Description,
 			Sla:          severity.Sla,
 			SlackUserIds: severity.SlackUserIds,
-			UpdatedAt: 	  severity.Model.UpdatedAt,
+			UpdatedAt:    severity.Model.UpdatedAt,
 		})
 	}
 
@@ -93,12 +93,16 @@ func (s *severityService) GetSeverities(c *gin.Context) {
 }
 
 func (s *severityService) UpdateSeverities(c *gin.Context) {
+	userEmail := c.GetHeader("X-User-Email")
+
 	var updateSeverityRequest request.UpdateSeveritiesRequest
 	if err := c.ShouldBindJSON(&updateSeverityRequest); err != nil {
 		c.JSON(http.StatusInternalServerError, common.ErrorResponse(err, http.StatusBadRequest, nil))
 		return
 	}
 
+	s.logger.Info("update request received", zap.String("userEmail", userEmail), zap.Any("request", updateSeverityRequest))
+
 	err := utils.ValidateUpdateSeverityRequest(updateSeverityRequest)
 	if err != nil {
 		s.logger.Error("error in validating update severties request", zap.Error(err))
diff --git a/service/team_service.go b/service/team_service.go
index a6e47b9..c778085 100644
--- a/service/team_service.go
+++ b/service/team_service.go
@@ -88,6 +88,8 @@ func (t *teamService) GetTeams(c *gin.Context) {
 }
 
 func (t *teamService) UpdateTeam(c *gin.Context) {
+	userEmail := c.GetHeader("X-User-Email")
+
 	teamRepository := team.NewTeamRepository(t.logger, t.db)
 
 	var updateTeamRequest request.UpdateTeamRequest
@@ -96,6 +98,8 @@ func (t *teamService) UpdateTeam(c *gin.Context) {
 		return
 	}
 
+	t.logger.Info("update team request received", zap.String("userEmail", userEmail), zap.Any("request", updateTeamRequest))
+
 	err := utils.ValidateUpdateTeamRequest(updateTeamRequest)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, common.ErrorResponse(err, http.StatusBadRequest, nil))