diff --git a/src/forms/followup/2.1.json b/src/forms/followup/2.1.json
index a7a70b8d..088b19e8 100644
--- a/src/forms/followup/2.1.json
+++ b/src/forms/followup/2.1.json
@@ -9504,7 +9504,7 @@
 								"rendering": "eth-date",
 								"concept": "164384AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 							},
-							"readonly": "false",
+							"readonly": "true",
 							"hide": {
 								"hideWhenExpression": "artStarted !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 							},
diff --git a/src/forms/pre-exposure-followup/1.0.json b/src/forms/pre-exposure-followup/1.0.json
index 712c828f..71b1e100 100644
--- a/src/forms/pre-exposure-followup/1.0.json
+++ b/src/forms/pre-exposure-followup/1.0.json
@@ -1055,6 +1055,23 @@
                 "hideWhenExpression": "followupStatus !== 'de4bd0d5-f826-4556-9e30-fa8e91c4c398' && followupStatus !== '488236af-a2fe-4b04-b62c-eabd27b05ea4' && followupStatus !== '166536AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
+            {
+              "label": "PrEP dose end date",
+              "type": "obs",
+              "required": false,
+              "id": "prepDoseEndDate",
+              "readonly": "true",
+              "questionOptions": {
+                "rendering": "date",
+                "concept": "1dcc457b-638c-4103-887b-4e8581e052f8",
+                "calculate": {
+									"calculateExpression": "CustomNextVisitDateCalc('followupDate','arvDispensedInDays')"
+								},
+                "conceptMappings": [],
+                "answers": []
+              },
+              "validators": []
+            },
             {
               "label": "Number of missed tablets in the past 30 days",
               "type": "obs",
@@ -1174,7 +1191,7 @@
 								"concept": "c596f199-4d76-4eca-b3c4-ffa631c0aee9",
 								"weeksList": ""
 							},
-							"readonly": "false",
+							"readonly": "true",
 							"id": "nextVisitDate"
 						}
           ]