diff --git a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
index ae0da6078..43429cedf 100644
--- a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
@@ -118,7 +118,7 @@
                 "concept": "",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '6c45421e-2566-47cb-bbb3-07586fffbfe2', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a')).valueString"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '6c45421e-2566-47cb-bbb3-07586fffbfe2', '677d1a80-dbbe-4399-be34-aa7f54f11405')).valueString"
                 }
               },
               "hide":{
@@ -298,7 +298,7 @@
                 "concept": "164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueCodeableConcept?.coding[0]?.code"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueCodeableConcept?.coding[0]?.code"
                 },
                 "answers": [
                   {
@@ -373,7 +373,7 @@
                 "concept": "159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "fixed-field",
                 "calculate":{
-                  "calculateExpression":"resolve(api.getLatestObs(patient.id, '159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueCodeableConcept?.coding[0]?.code"
+                  "calculateExpression":"resolve(api.getLatestObs(patient.id, '159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueCodeableConcept?.coding[0]?.code"
                 },
                 "answers": [
                   {
@@ -770,7 +770,7 @@
                 "concept": "161557AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '161557AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueCodeableConcept?.coding[0]?.code"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '161557AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueCodeableConcept?.coding[0]?.code"
                 },
                 "answers": [
                   {
@@ -895,7 +895,7 @@
                 "concept": "1436AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '1436AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueCodeableConcept?.coding[0]?.code"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '1436AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueCodeableConcept?.coding[0]?.code"
                 },
                 "answers": [
                   {
diff --git a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
index 7a0342784..fe3e6041d 100644
--- a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
@@ -130,7 +130,7 @@
                 "concept": "",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '6c45421e-2566-47cb-bbb3-07586fffbfe2', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a')).valueString"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '6c45421e-2566-47cb-bbb3-07586fffbfe2', '677d1a80-dbbe-4399-be34-aa7f54f11405')).valueString"
                 }
               },
               "hide":{
@@ -150,7 +150,7 @@
               "questionOptions": {
                 "concept": "c5f74c86-62cd-4d22-9260-4238f1e45fe0",
                 "rendering": "radio",
-                "calculate": {"calculateExpression": "resolve(api.getLatestObs('2549af50-75c8-4aeb-87ca-4bb2cef6c69a', '164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'))"},
+                "calculate": {"calculateExpression": "resolve(api.getLatestObs('677d1a80-dbbe-4399-be34-aa7f54f11405', '164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'))"},
                 "answers": [
                   {
                     "concept": "8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8",
@@ -472,7 +472,7 @@
                 "concept": "159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "fixed-field",
                 "calculate":{
-                  "calculateExpression":"resolve(api.getLatestObs(patient.id, '159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueCodeableConcept?.coding[0]?.code"
+                  "calculateExpression":"resolve(api.getLatestObs(patient.id, '159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueCodeableConcept?.coding[0]?.code"
                 },
                 "answers": [
                   {
@@ -799,7 +799,7 @@
                 "concept": "",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueQuantity?.value"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '164402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueQuantity?.value"
                 }
               },
               "hide":{
@@ -814,7 +814,7 @@
                 "concept": "",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '159599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueDateTime"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '159599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueDateTime"
                 }
               },
               "hide":{
diff --git a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
index 46866e653..98c95c3d1 100644
--- a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
@@ -113,7 +113,7 @@
                 "concept": "",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '6c45421e-2566-47cb-bbb3-07586fffbfe2', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a')).valueString"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '6c45421e-2566-47cb-bbb3-07586fffbfe2', '677d1a80-dbbe-4399-be34-aa7f54f11405')).valueString"
                 }
               },
               "hide":{
@@ -139,7 +139,7 @@
                 "concept": "164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "fixed-value",
                 "calculate": {
-                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueCodeableConcept?.coding[0]?.code"
+                  "calculateExpression": "resolve(api.getLatestObs(patient.id, '164401AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueCodeableConcept?.coding[0]?.code"
                 },
                 "answers": [
                   {
@@ -178,7 +178,7 @@
                 "concept": "159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "fixed-field",
                 "calculate":{
-                  "calculateExpression":"resolve(api.getLatestObs(patient.id, '159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '2549af50-75c8-4aeb-87ca-4bb2cef6c69a'))?.valueCodeableConcept?.coding[0]?.code"
+                  "calculateExpression":"resolve(api.getLatestObs(patient.id, '159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '677d1a80-dbbe-4399-be34-aa7f54f11405'))?.valueCodeableConcept?.coding[0]?.code"
                 },
                 "answers": [
                   {