diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/bloodPressure/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/bloodPressure/selector.json
index 94ede4bb1..ef3aa2534 100644
--- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/bloodPressure/selector.json
+++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/bloodPressure/selector.json
@@ -2,7 +2,7 @@
   "name": "tanagra-blood-pressure",
   "displayName": "Blood pressure",
   "isEnabledForCohorts": true,
-  "isEnabledForDataFeatureSets": false,
+  "isEnabledForDataFeatureSets": true,
   "display": {
     "category": "Physical Measurements",
     "tags": null
diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/bmi/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/bmi/selector.json
index 933f2e725..ff87c9ed6 100644
--- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/bmi/selector.json
+++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/bmi/selector.json
@@ -2,7 +2,7 @@
   "name": "tanagra-bmi",
   "displayName": "BMI",
   "isEnabledForCohorts": true,
-  "isEnabledForDataFeatureSets": false,
+  "isEnabledForDataFeatureSets": true,
   "display": {
     "category": "Physical Measurements",
     "tags": null
diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/heartRate/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/heartRate/selector.json
index f833c0e3d..d177a846b 100644
--- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/heartRate/selector.json
+++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/heartRate/selector.json
@@ -2,7 +2,7 @@
   "name": "tanagra-heart-rate",
   "displayName": "Heart Rate",
   "isEnabledForCohorts": true,
-  "isEnabledForDataFeatureSets": false,
+  "isEnabledForDataFeatureSets": true,
   "display": {
     "category": "Physical Measurements",
     "tags": null
diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/height/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/height/selector.json
index f86b678a2..f3b7132a1 100644
--- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/height/selector.json
+++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/height/selector.json
@@ -2,7 +2,7 @@
   "name": "tanagra-height",
   "displayName": "Height",
   "isEnabledForCohorts": true,
-  "isEnabledForDataFeatureSets": false,
+  "isEnabledForDataFeatureSets": true,
   "display": {
     "category": "Physical Measurements",
     "tags": null
diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/hipCircumference/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/hipCircumference/selector.json
index 1c51ff378..323750cf6 100644
--- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/hipCircumference/selector.json
+++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/hipCircumference/selector.json
@@ -2,7 +2,7 @@
   "name": "tanagra-hip-circumference",
   "displayName": "Hip Circumference",
   "isEnabledForCohorts": true,
-  "isEnabledForDataFeatureSets": false,
+  "isEnabledForDataFeatureSets": true,
   "display": {
     "category": "Physical Measurements",
     "tags": null
diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/waistCircumference/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/waistCircumference/selector.json
index 6bd6ba388..efa547961 100644
--- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/waistCircumference/selector.json
+++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/waistCircumference/selector.json
@@ -2,7 +2,7 @@
   "name": "tanagra-waist-circumference",
   "displayName": "Waist Circumference",
   "isEnabledForCohorts": true,
-  "isEnabledForDataFeatureSets": false,
+  "isEnabledForDataFeatureSets": true,
   "display": {
     "category": "Physical Measurements",
     "tags": null
diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/weight/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/weight/selector.json
index d84a60268..590373f46 100644
--- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/weight/selector.json
+++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/weight/selector.json
@@ -2,7 +2,7 @@
   "name": "tanagra-weight",
   "displayName": "Weight",
   "isEnabledForCohorts": true,
-  "isEnabledForDataFeatureSets": false,
+  "isEnabledForDataFeatureSets": true,
   "display": {
     "category": "Physical Measurements",
     "tags": null