diff --git a/distro/configuration/ampathforms/initial_consultation-lime_demo.json b/distro/configuration/ampathforms/initial_consultation-lime_demo.json
index 77b73d9..32ed941 100644
--- a/distro/configuration/ampathforms/initial_consultation-lime_demo.json
+++ b/distro/configuration/ampathforms/initial_consultation-lime_demo.json
@@ -20,20 +20,39 @@
 				"id": "date",
 				"questionOptions": {
 				  "rendering": "date",
-				  "concept": "162869AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-				  "conceptMappings": [
+				  "concept": "81a50873-81c8-4c2e-8892-b2cd635b704c",
+				  "conceptMappings": [],
+				  "answers": []
+				},
+				"validators": []
+			  },
+			  {
+				"label": "Triage color code",
+				"type": "obs",
+				"required": false,
+				"id": "triage",
+				"questionOptions": {
+				  "rendering": "radio",
+				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0177",
+				  "conceptMappings": [],
+				  "answers": [
 					{
-					  "relationship": "NARROWER-THAN",
-					  "type": "SNOMED CT",
-					  "value": "364713004"
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0178",
+					  "label": "DOA"
 					},
 					{
-					  "relationship": "SAME-AS",
-					  "type": "CIEL",
-					  "value": "162869"
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0181",
+					  "label": "Green"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0180",
+					  "label": "Yellow"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0179",
+					  "label": "Red"
 					}
-				  ],
-				  "answers": []
+				  ]
 				},
 				"validators": []
 			  },
@@ -1409,7 +1428,7 @@
 				"required": false,
 				"id": "past-medical-history",
 				"questionOptions": {
-				  "rendering": "text",
+				  "rendering": "textarea",
 				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0172",
 				  "conceptMappings": [],
 				  "answers": []
@@ -1433,55 +1452,55 @@
 				  ],
 				  "answers": [
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0190",
+					  "concept": "117399AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Hypertension"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0191",
+					  "concept": "130987AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Palpitations"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0192",
+					  "concept": "122496AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Dyspnea"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0193",
+					  "concept": "121375AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Asthma"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0194",
+					  "concept": "112141AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Tuberculosis"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0195",
+					  "concept": "119481AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Diabetes Mellitus"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0196",
+					  "concept": "121610AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Angina"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0197",
+					  "concept": "114262AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Peptic Ulcer"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0198",
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0008",
 					  "label": "Jaundice"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0199",
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0044",
 					  "label": "Epilepsy"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0200",
+					  "concept": "111479AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Hepatitis"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0201",
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0031",
 					  "label": "COPD"
 					},
 					{
-					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0202",
+					  "concept": "117460AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "High Cholesterol"
 					},
 					{
@@ -1511,6 +1530,80 @@
 				"hide": {
 				  "hideWhenExpression": "Current-problems !== '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 				}
+			  },
+			  {
+				"label": "Case history",
+				"type": "obs",
+				"required": false,
+				"id": "case-history",
+				"questionOptions": {
+				  "rendering": "select",
+				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0182",
+				  "conceptMappings": [],
+				  "answers": [
+					{
+					  "concept": "140238AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "Fever"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0204",
+					  "label": "Shivers"
+					},
+					{
+					  "concept": "139084AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "Headache"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0206",
+					  "label": "Vomit"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0207",
+					  "label": "Convulsions"
+					},
+					{
+					  "concept": "122496AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "Dyspnea"
+					},
+					{
+					  "concept": "143264AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "Cough"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0210",
+					  "label": "Sputum"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0211",
+					  "label": "Sputum with blood"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0212",
+					  "label": "Purulent"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0213",
+					  "label": "Diarrhoea"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0214",
+					  "label": "Diarrhoea with blood"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0215",
+					  "label": "Dysuria"
+					},
+					{
+					  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0216",
+					  "label": "Dysuria with blood"
+					},
+					{
+					  "concept": "136455AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "Itching"
+					}
+				  ]
+				},
+				"validators": []
 			  }
 			]
 		  },
@@ -1524,7 +1617,7 @@
 				"required": false,
 				"id": "skin",
 				"questionOptions": {
-				  "rendering": "text",
+				  "rendering": "textarea",
 				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0174",
 				  "conceptMappings": [],
 				  "answers": []
@@ -1537,7 +1630,7 @@
 				"required": false,
 				"id": "lungs",
 				"questionOptions": {
-				  "rendering": "text",
+				  "rendering": "textarea",
 				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0175",
 				  "conceptMappings": [],
 				  "answers": []
@@ -1550,7 +1643,7 @@
 				"required": false,
 				"id": "cardio",
 				"questionOptions": {
-				  "rendering": "text",
+				  "rendering": "textarea",
 				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0176",
 				  "conceptMappings": [],
 				  "answers": []
@@ -1563,7 +1656,7 @@
 				"required": false,
 				"id": "g-ur",
 				"questionOptions": {
-				  "rendering": "text",
+				  "rendering": "textarea",
 				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0183",
 				  "conceptMappings": [],
 				  "answers": []
@@ -1576,34 +1669,34 @@
 				"required": false,
 				"id": "neuro",
 				"questionOptions": {
-				  "rendering": "text",
-				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0184",
+				  "rendering": "textarea",
+				  "concept": "ac0975ce-6a00-438b-8133-57aab268e106",
 				  "conceptMappings": [],
 				  "answers": []
 				},
 				"validators": []
 			  },
 			  {
-				"label": "Osteo articular syst",
+				"label": "Osteo articular system",
 				"type": "obs",
 				"required": false,
 				"id": "osteo",
 				"questionOptions": {
-				  "rendering": "text",
-				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0185",
+				  "rendering": "textarea",
+				  "concept": "c956b688-ff2e-4629-a89a-5d0c7f645481",
 				  "conceptMappings": [],
 				  "answers": []
 				},
 				"validators": []
 			  },
 			  {
-				"label": "Drums/ Throat",
+				"label": "Drums / Throat",
 				"type": "obs",
 				"required": false,
 				"id": "drums",
 				"questionOptions": {
-				  "rendering": "text",
-				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0186",
+				  "rendering": "textarea",
+				  "concept": "5a2efe86-538c-4a00-bde0-a4b9c4470fae",
 				  "conceptMappings": [],
 				  "answers": []
 				},
@@ -1615,8 +1708,8 @@
 				"required": false,
 				"id": "lymphatic",
 				"questionOptions": {
-				  "rendering": "text",
-				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0187",
+				  "rendering": "textarea",
+				  "concept": "3a942c7f-2efc-4c99-a383-219b59a942fd",
 				  "conceptMappings": [],
 				  "answers": []
 				},
@@ -1628,7 +1721,7 @@
 				"required": false,
 				"id": "other-med",
 				"questionOptions": {
-				  "rendering": "text",
+				  "rendering": "textarea",
 				  "concept": "da33d74e-33b3-495a-9d7c-aa00a-aa0188",
 				  "conceptMappings": [],
 				  "answers": []
diff --git a/distro/configuration/ocl/lime-demo_0.04.20230605012738.zip b/distro/configuration/ocl/lime-demo_0.04.20230605012738.zip
deleted file mode 100644
index b1b1901..0000000
Binary files a/distro/configuration/ocl/lime-demo_0.04.20230605012738.zip and /dev/null differ
diff --git a/distro/configuration/ocl/lime-demo_0.05.20230613153208.zip b/distro/configuration/ocl/lime-demo_0.05.20230613153208.zip
new file mode 100644
index 0000000..6936bf1
Binary files /dev/null and b/distro/configuration/ocl/lime-demo_0.05.20230613153208.zip differ
diff --git a/distro/pom.xml b/distro/pom.xml
index a727361..b5165bc 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs.distro</groupId>
     <artifactId>referenceapplication</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.0-beta.8</version>
   </parent>
 
   <artifactId>referenceapplication-distro</artifactId>
@@ -24,15 +24,16 @@
     <!-- track module versions
          we do so here so that we can utilise Maven to track updates, etc. -->
     <fhir2.version>1.9.0</fhir2.version>
-    <openmrs.version>2.6.1</openmrs.version>
-    <initializer.version>2.5.0</initializer.version>
-    <webservices.rest.version>2.40.0</webservices.rest.version>
+    <openmrs.version>2.6.0</openmrs.version>
+    <datafilter.version>2.1.1</datafilter.version>
+    <initializer.version>2.5.1</initializer.version>
+    <webservices.rest.version>2.39.0</webservices.rest.version>
     <addresshierarchy.version>2.15.1</addresshierarchy.version>
-    <idgen.version>4.10.0</idgen.version>
+    <idgen.version>4.10.0-SNAPSHOT</idgen.version>
     <legacyui.version>1.15.0</legacyui.version>
     <metadatamapping.version>1.6.0</metadatamapping.version>
     <metadatasharing.version>1.9.0</metadatasharing.version>
-    <openconceptlab.version>2.1.0</openconceptlab.version>
+    <openconceptlab.version>2.1.0-SNAPSHOT</openconceptlab.version>
     <!-- this is request for the OCL UI -->
     <owa.version>1.14.0</owa.version>
     <attachments.version>3.0.0</attachments.version>
@@ -45,7 +46,7 @@
     <calculation.version>1.3.0</calculation.version>
     <htmlwidgets.version>1.11.0</htmlwidgets.version>
     <serialization-xstream.version>0.2.16</serialization-xstream.version>
-    <ordertemplates.version>1.0.2</ordertemplates.version>
+    <ordertemplates.version>1.0.1</ordertemplates.version>
   </properties>
 
   <dependencies>
@@ -58,6 +59,12 @@
     </dependency>
 
     <!-- Module dependencies -->
+    <dependency>
+      <groupId>org.openmrs.module</groupId>
+      <artifactId>datafilter-omod</artifactId>
+      <version>${datafilter.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.openmrs.module</groupId>
       <artifactId>initializer-omod</artifactId>
@@ -221,7 +228,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
@@ -261,27 +267,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>validator</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.openmrs.maven.plugins</groupId>
-            <artifactId>openmrs-packager-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>validate-configurations</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>validate-configurations</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 093ffa1..498aaaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <name>Package and Run OpenMRS</name>
   <description>Convenient project to build an OpenMRS distribution and run it</description>
 
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.0.0-beta.8</version>
   <packaging>pom</packaging>
 
   <organization>
@@ -111,11 +111,6 @@
           <artifactId>openmrs-sdk-maven-plugin</artifactId>
           <version>4.5.0</version>
         </plugin>
-        <plugin>
-          <groupId>org.openmrs.maven.plugins</groupId>
-          <artifactId>openmrs-packager-maven-plugin</artifactId>
-          <version>1.7.0</version>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -141,9 +136,6 @@
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
     </repository>
     <repository>
       <id>mks-nexus-public</id>
@@ -183,20 +175,6 @@
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>mks-nexus-public</id>
-      <url>https://nexus.mekomsolutions.net/repository/maven-public/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>mks-nexus-snapshots</id>
-      <url>https://nexus.mekomsolutions.net/repository/maven-snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
     </pluginRepository>
   </pluginRepositories>
 
@@ -204,7 +182,7 @@
     <repository>
       <id>openmrs-repo-releases</id>
       <name>OpenMRS Releases Repo</name>
-      <url>https://mavenrepo.openmrs.org/releases</url>
+      <url>https://openmrs.jfrog.io/artifactory/releases</url>
     </repository>
     <snapshotRepository>
       <id>openmrs-repo-snapshots</id>