diff --git a/bahmnicore-omod/src/main/resources/liquibase.xml b/bahmnicore-omod/src/main/resources/liquibase.xml
index be46369d52..8688dbf554 100644
--- a/bahmnicore-omod/src/main/resources/liquibase.xml
+++ b/bahmnicore-omod/src/main/resources/liquibase.xml
@@ -4330,4 +4330,67 @@
             INSERT INTO role_privilege(role, privilege) VALUES ("OT: ReadOnly", "app:ot");
         </sql>
     </changeSet>
+    <changeSet id="201805112235" author="Suman">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="1">
+                SELECT count(*) FROM concept_view WHERE concept_full_name = 'Bahmni Initial Diagnosis';
+            </sqlCheck>
+            <sqlCheck expectedResult="1">
+                SELECT count(*) FROM concept WHERE is_set= TRUE AND concept_id = (SELECT concept_id FROM concept_view
+                WHERE concept_full_name = 'Bahmni Initial Diagnosis');
+            </sqlCheck>
+            <sqlCheck expectedResult="0">
+                SELECT count(*) FROM concept_set WHERE concept_set = (SELECT concept_id FROM concept_view
+                WHERE concept_full_name = 'Bahmni Initial Diagnosis');
+            </sqlCheck>
+        </preConditions>
+        <comment>Updating 'Bahmni Initial Diagnosis' concept to non-set concept</comment>
+        <sql>
+            SET @concept_id=0;
+            SELECT concept_id FROM concept_view WHERE concept_full_name = 'Bahmni Initial Diagnosis' INTO @concept_id;
+            UPDATE concept SET is_set = FALSE WHERE concept_id = @concept_id;
+        </sql>
+    </changeSet>
+    <changeSet id="201805112237" author="Suman">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="1">
+                SELECT count(*) FROM concept_view WHERE concept_full_name = 'Bahmni Diagnosis Status';
+            </sqlCheck>
+            <sqlCheck expectedResult="1">
+                SELECT count(*) FROM concept WHERE is_set= TRUE AND concept_id = (SELECT concept_id FROM concept_view
+                WHERE concept_full_name = 'Bahmni Diagnosis Status');
+            </sqlCheck>
+            <sqlCheck expectedResult="0">
+                SELECT count(*) FROM concept_set WHERE concept_set = (SELECT concept_id FROM concept_view
+                WHERE concept_full_name = 'Bahmni Diagnosis Status');
+            </sqlCheck>
+        </preConditions>
+        <comment>Updating 'Bahmni Diagnosis Status' concept to non-set concept</comment>
+        <sql>
+            SET @concept_id=0;
+            SELECT concept_id FROM concept_view WHERE concept_full_name = 'Bahmni Diagnosis Status' INTO @concept_id;
+            UPDATE concept SET is_set = FALSE WHERE concept_id = @concept_id;
+        </sql>
+    </changeSet>
+    <changeSet id="201805112239" author="Suman">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="1">
+                SELECT count(*) FROM concept_view WHERE concept_full_name = 'Bahmni Diagnosis Revised';
+            </sqlCheck>
+            <sqlCheck expectedResult="1">
+                SELECT count(*) FROM concept WHERE is_set= TRUE AND concept_id = (SELECT concept_id FROM concept_view
+                WHERE concept_full_name = 'Bahmni Diagnosis Revised');
+            </sqlCheck>
+            <sqlCheck expectedResult="0">
+                SELECT count(*) FROM concept_set WHERE concept_set = (SELECT concept_id FROM concept_view
+                WHERE concept_full_name = 'Bahmni Diagnosis Revised');
+            </sqlCheck>
+        </preConditions>
+        <comment>Updating 'Bahmni Diagnosis Revised' concept to non-set concept</comment>
+        <sql>
+            SET @concept_id=0;
+            SELECT concept_id FROM concept_view WHERE concept_full_name = 'Bahmni Diagnosis Revised' INTO @concept_id;
+            UPDATE concept SET is_set = FALSE WHERE concept_id = @concept_id;
+        </sql>
+    </changeSet>
 </databaseChangeLog>