diff --git a/build.gradle b/build.gradle
index e5ab07cc..17c10678 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
index 0f5be73e..68e0da80 100644
--- a/claimManagement/build.gradle
+++ b/claimManagement/build.gradle
@@ -189,6 +189,7 @@ android {
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
     }
+    namespace 'org.openimis.imisclaims'
 }
 
 apollo {
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
index d778be08..3ecb8edd 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
@@ -22,6 +22,7 @@
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -85,6 +86,7 @@ public static Intent newIntent(@NonNull Context context, @NonNull String claimUU
     RadioButton rbEmergency, rbReferral, rbOther, rbHealed, rbDiseased, rbEscaped, rbReferal;
     ImageButton btnScan;
     CheckBox etPreAuthorization;
+    LinearLayout llDiagnosis;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -130,6 +132,7 @@ protected void onCreate(Bundle savedInstanceState) {
         etPreAuthorization = findViewById(R.id.etPreAuthorization);
         etReferralCode = findViewById(R.id.etReferralCode);
         etPrescriber = findViewById(R.id.etPrescriber);
+        llDiagnosis = findViewById(R.id.ll_diagnosis);
 
         tvItemTotal.setText("0");
         tvServiceTotal.setText("0");
@@ -168,6 +171,8 @@ protected void onCreate(Bundle savedInstanceState) {
         etReferalHF.setVisibility(View.GONE);
         etPreAuthorization.setVisibility(View.GONE);
         etReferralCode.setVisibility(View.GONE);
+        etDiagnosis.setVisibility(View.GONE);
+        llDiagnosis.setVisibility(View.GONE);
 
         rgVisitType.setOnCheckedChangeListener((radioGroup, i) -> {
             if(radioGroup.getCheckedRadioButtonId() == R.id.rbReferral){
@@ -792,10 +797,10 @@ private boolean isValidData() {
             Log.e(LOG_TAG, "Error while parsing dates", e);
         }
 
-        if (etDiagnosis.getText().length() == 0) {
-            showValidationDialog(etDiagnosis, getResources().getString(R.string.MissingDisease));
-            return false;
-        }
+//        if (etDiagnosis.getText().length() == 0) {
+//            showValidationDialog(etDiagnosis, getResources().getString(R.string.MissingDisease));
+//            return false;
+//        }
 
         if (rgVisitType.getCheckedRadioButtonId() == -1) {
             showValidationDialog(rgVisitType, getResources().getString(R.string.MissingVisitType));
diff --git a/claimManagement/src/main/res/layout/activity_claim.xml b/claimManagement/src/main/res/layout/activity_claim.xml
index 1f5eea8a..f7b08ada 100644
--- a/claimManagement/src/main/res/layout/activity_claim.xml
+++ b/claimManagement/src/main/res/layout/activity_claim.xml
@@ -90,6 +90,7 @@
                 android:maxLength="8"/>
 
             <LinearLayout
+                android:id="@+id/ll_diagnosis"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a77e98eb..57752260 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Dec 03 10:17:47 CET 2021
+#Thu Dec 04 17:05:34 WAT 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists