diff --git a/app/build.gradle b/app/build.gradle
index b187abddaf..895c233674 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,25 +33,41 @@ android {
         }
     }
     productFlavors {
+        full {
+            buildConfigField "boolean", "APS", "true"
+            buildConfigField "boolean", "PUMPDRIVERS", "true"
+            buildConfigField "boolean", "CLOSEDLOOP", "true"
+            buildConfigField "int", "MAXBOLUS", "17"
+        }
+        fullteenage {
+            buildConfigField "boolean", "APS", "true"
+            buildConfigField "boolean", "PUMPDRIVERS", "true"
+            buildConfigField "boolean", "CLOSEDLOOP", "true"
+            buildConfigField "int", "MAXBOLUS", "10"
+        }
+        fullchild {
+            buildConfigField "boolean", "APS", "true"
+            buildConfigField "boolean", "PUMPDRIVERS", "true"
+            buildConfigField "boolean", "CLOSEDLOOP", "true"
+            buildConfigField "int", "MAXBOLUS", "5"
+        }
         danarcontrol {
             buildConfigField "boolean", "APS", "false"
             buildConfigField "boolean", "PUMPDRIVERS", "true"
             buildConfigField "boolean", "CLOSEDLOOP", "false"
+            buildConfigField "int", "MAXBOLUS", "17"
         }
         careportal {
             buildConfigField "boolean", "APS", "false"
             buildConfigField "boolean", "PUMPDRIVERS", "false"
             buildConfigField "boolean", "CLOSEDLOOP", "false"
+            buildConfigField "int", "MAXBOLUS", "17"
         }
         openloop {
             buildConfigField "boolean", "APS", "true"
             buildConfigField "boolean", "PUMPDRIVERS", "true"
             buildConfigField "boolean", "CLOSEDLOOP", "false"
-        }
-        full {
-            buildConfigField "boolean", "APS", "true"
-            buildConfigField "boolean", "PUMPDRIVERS", "true"
-            buildConfigField "boolean", "CLOSEDLOOP", "true"
+            buildConfigField "int", "MAXBOLUS", "17"
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgBolusStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgBolusStart.java
index 2e2980cb70..faa66237f6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgBolusStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgBolusStart.java
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.DanaR.comm;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 
@@ -19,7 +20,7 @@ public class MsgBolusStart extends MessageBase {
         // HARDCODED LIMIT
         amount = MainApp.getConfigBuilder().applyBolusConstraints(amount);
         if (amount < 0) amount = 0d;
-        if (amount > 17) amount = 17d; // TODO: add to constraints too
+        if (amount > BuildConfig.MAXBOLUS) amount = BuildConfig.MAXBOLUS;
 
         AddParamInt((int) (amount * 100));
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SafetyFragment/SafetyPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SafetyFragment/SafetyPlugin.java
index 8306d35327..4003fedbdd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SafetyFragment/SafetyPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SafetyFragment/SafetyPlugin.java
@@ -177,6 +177,7 @@ public class SafetyPlugin implements PluginBase, ConstraintsInterface {
         } catch (Exception e) {
             insulin = 0d;
         }
+        if (insulin > BuildConfig.MAXBOLUS) insulin = Double.valueOf(BuildConfig.MAXBOLUS);
         return insulin;
     }