diff --git a/configuration/ampathforms/HIV_Enrollment.json b/configuration/ampathforms/HIV_Enrollment.json
index aa2e9303..7e82adaf 100644
--- a/configuration/ampathforms/HIV_Enrollment.json
+++ b/configuration/ampathforms/HIV_Enrollment.json
@@ -1459,9 +1459,16 @@
                   "id": "tsTelephone",
                   "questionOptions": {
                     "concept": "160642AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "rendering": "number",
+                    "rendering": "text",
                     "min": "0"
-                  }
+                  },
+                  "validators": [
+                    {
+                      "type": "js_expression",
+                      "failsWhenExpression": "doesNotMatchExpression('^0([0-9](?:(?:[0-9][0-9])|(?:0[0-8])|(4[0-1]))[0-9]{6})$', tsTelephone)",
+                      "message": "Invalid phone number, please enter number in the format 0000000000 example 0720200200"
+                    }
+                  ]
                 },
                 {
                   "label": "Postal address",
diff --git a/configuration/ampathforms/HTS_Eligibility_Screening.json b/configuration/ampathforms/HTS_Eligibility_Screening.json
index 4f988b8e..2a32daf8 100644
--- a/configuration/ampathforms/HTS_Eligibility_Screening.json
+++ b/configuration/ampathforms/HTS_Eligibility_Screening.json
@@ -361,10 +361,6 @@
                     "concept": "166606AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Social Contact"
                   },
-                  {
-                    "concept": "166517AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Needle Sharing"
-                  },
                   {
                     "concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "None"