diff --git a/api/src/main/java/ca/bc/gov/educ/api/pen/replication/constants/EventOutcome.java b/api/src/main/java/ca/bc/gov/educ/api/pen/replication/constants/EventOutcome.java
index f7d566c..fda38f1 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/pen/replication/constants/EventOutcome.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/pen/replication/constants/EventOutcome.java
@@ -58,10 +58,14 @@ public enum EventOutcome {
 
   SCHOOL_UPDATED_IN_IOSAS,
 
+  SCHOOL_UPDATE_SKIPPED_IN_IOSAS,
+
   SCHOOL_CREATED_IN_ISFS,
 
   SCHOOL_UPDATED_IN_ISFS,
 
+  SCHOOL_UPDATE_SKIPPED_IN_ISFS,
+
 
   DISTRICT_UPDATED,
 
diff --git a/api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/AuthorityUpdateOrchestrator.java b/api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/AuthorityUpdateOrchestrator.java
index 4dfff84..9d4bbd2 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/AuthorityUpdateOrchestrator.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/AuthorityUpdateOrchestrator.java
@@ -35,8 +35,8 @@ public class AuthorityUpdateOrchestrator extends BaseOrchestrator<AuthorityUpdat
     public static final String RESPONDED_VIA_NATS_TO_FOR_EVENT = "responded via NATS to {} for {} Event. :: {}";
     private final RestUtils restUtils;
 
-    private AuthorityMasterRepository authorityMasterRepository = null;
-    private AuthorityMapperHelper authorityMapperHelper = null;
+    private AuthorityMasterRepository authorityMasterRepository;
+    private AuthorityMapperHelper authorityMapperHelper;
     private static final AuthorityMapper authorityMapper = AuthorityMapper.mapper;
 
 
diff --git a/api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/SchoolUpdateOrchestrator.java b/api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/SchoolUpdateOrchestrator.java
index 6d96c50..ea2c21e 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/SchoolUpdateOrchestrator.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/pen/replication/orchestrator/SchoolUpdateOrchestrator.java
@@ -123,33 +123,54 @@ private void updateSchoolInIOSAS(final Event event, final Saga saga, final Schoo
         saga.setSagaState(UPDATE_SCHOOL_IN_IOSAS.toString());
         final SagaEvent eventStates = this.createEventState(saga, event.getEventType(), event.getEventOutcome(), event.getEventPayload());
         this.getSagaService().updateAttachedSagaWithEvents(saga, eventStates);
+        if (StringUtils.equalsAnyIgnoreCase("INDEPEND", schoolCreateSagaData.getSchool().getSchoolCategoryCode().toString()) || StringUtils.equalsAnyIgnoreCase("INDP_FNS", schoolCreateSagaData.getSchool().getSchoolCategoryCode().toString())) {
+            restUtils.createOrUpdateSchoolInIndependentSchoolSystem(schoolCreateSagaData.getSchool(), IndependentSchoolSystem.IOSAS);
 
-        restUtils.createOrUpdateSchoolInIndependentSchoolSystem(schoolCreateSagaData.getSchool(), IndependentSchoolSystem.IOSAS);
-
-        val nextEvent = Event.builder().sagaId(saga.getSagaId())
-                .eventType(UPDATE_SCHOOL_IN_IOSAS)
-                .eventOutcome(SCHOOL_UPDATED_IN_IOSAS)
-                .eventPayload(JsonUtil.getJsonStringFromObject(schoolCreateSagaData.getSchool()))
-                .build();
-        this.postMessageToTopic(this.getTopicToSubscribe().getCode(), nextEvent); // this will make it async and use pub/sub flow even though it is sending message to itself
-        log.info(RESPONDED_VIA_NATS_TO_FOR_EVENT, this.getTopicToSubscribe(), UPDATE_SCHOOL_IN_IOSAS, saga.getSagaId());
+            val nextEvent = Event.builder().sagaId(saga.getSagaId())
+                    .eventType(UPDATE_SCHOOL_IN_IOSAS)
+                    .eventOutcome(SCHOOL_UPDATED_IN_IOSAS)
+                    .eventPayload(JsonUtil.getJsonStringFromObject(schoolCreateSagaData.getSchool()))
+                    .build();
+            this.postMessageToTopic(this.getTopicToSubscribe().getCode(), nextEvent); // this will make it async and use pub/sub flow even though it is sending message to itself
+            log.info(RESPONDED_VIA_NATS_TO_FOR_EVENT, this.getTopicToSubscribe(), UPDATE_SCHOOL_IN_IOSAS, saga.getSagaId());
+        } else {
+            val nextEvent = Event.builder().sagaId(saga.getSagaId())
+                    .eventType(UPDATE_SCHOOL_IN_IOSAS)
+                    .eventOutcome(SCHOOL_UPDATE_SKIPPED_IN_IOSAS)
+                    .eventPayload(JsonUtil.getJsonStringFromObject(schoolCreateSagaData.getSchool()))
+                    .build();
+            this.postMessageToTopic(this.getTopicToSubscribe().getCode(), nextEvent); // this will make it async and use pub/sub flow even though it is sending message to itself
+            log.info(RESPONDED_VIA_NATS_TO_FOR_EVENT, this.getTopicToSubscribe(), UPDATE_SCHOOL_IN_IOSAS, saga.getSagaId());
+        }
     }
 
+
     private void updateSchoolInISFS(final Event event, final Saga saga, final SchoolUpdateSagaData schoolCreateSagaData) throws JsonProcessingException {
         saga.setSagaState(UPDATE_SCHOOL_IN_ISFS.toString());
         final SagaEvent eventStates = this.createEventState(saga, event.getEventType(), event.getEventOutcome(), event.getEventPayload());
         this.getSagaService().updateAttachedSagaWithEvents(saga, eventStates);
+        if (StringUtils.equalsAnyIgnoreCase("INDEPEND", schoolCreateSagaData.getSchool().getSchoolCategoryCode().toString()) || StringUtils.equalsAnyIgnoreCase("INDP_FNS", schoolCreateSagaData.getSchool().getSchoolCategoryCode().toString())) {
+            restUtils.createOrUpdateSchoolInIndependentSchoolSystem(schoolCreateSagaData.getSchool(), IndependentSchoolSystem.ISFS);
 
-        restUtils.createOrUpdateSchoolInIndependentSchoolSystem(schoolCreateSagaData.getSchool(), IndependentSchoolSystem.ISFS);
+            val nextEvent = Event.builder().sagaId(saga.getSagaId())
+                    .eventType(UPDATE_SCHOOL_IN_ISFS)
+                    .eventOutcome(SCHOOL_UPDATED_IN_ISFS)
+                    .eventPayload(JsonUtil.getJsonStringFromObject(schoolCreateSagaData.getSchool()))
+                    .build();
+            this.postMessageToTopic(this.getTopicToSubscribe().getCode(), nextEvent); // this will make it async and use pub/sub flow even though it is sending message to itself
+            log.info(RESPONDED_VIA_NATS_TO_FOR_EVENT, this.getTopicToSubscribe(), UPDATE_SCHOOL_IN_ISFS, saga.getSagaId());
+        } else {
+            val nextEvent = Event.builder().sagaId(saga.getSagaId())
+                    .eventType(UPDATE_SCHOOL_IN_ISFS)
+                    .eventOutcome(SCHOOL_UPDATE_SKIPPED_IN_ISFS)
+                    .eventPayload(JsonUtil.getJsonStringFromObject(schoolCreateSagaData.getSchool()))
+                    .build();
+            this.postMessageToTopic(this.getTopicToSubscribe().getCode(), nextEvent); // this will make it async and use pub/sub flow even though it is sending message to itself
+            log.info(RESPONDED_VIA_NATS_TO_FOR_EVENT, this.getTopicToSubscribe(), UPDATE_SCHOOL_IN_ISFS, saga.getSagaId());
 
-        val nextEvent = Event.builder().sagaId(saga.getSagaId())
-                .eventType(UPDATE_SCHOOL_IN_ISFS)
-                .eventOutcome(SCHOOL_UPDATED_IN_ISFS)
-                .eventPayload(JsonUtil.getJsonStringFromObject(schoolCreateSagaData.getSchool()))
-                .build();
-        this.postMessageToTopic(this.getTopicToSubscribe().getCode(), nextEvent); // this will make it async and use pub/sub flow even though it is sending message to itself
-        log.info(RESPONDED_VIA_NATS_TO_FOR_EVENT, this.getTopicToSubscribe(), UPDATE_SCHOOL_IN_ISFS, saga.getSagaId());
+        }
     }
 
+
 }