diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
index c0a1268b3..599d9f33e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
@@ -235,6 +235,8 @@ var androidOperationModule = function () {
                     payload["kioskLogoImage"] = deviceGlobalConfigurations["kioskLogoImage"];
                     payload["kioskAppName"] = deviceGlobalConfigurations["kioskAppName"];
                     payload["isSingleModeApp"] = deviceGlobalConfigurations["isSingleModeApp"];
+                    payload["keepDisplayAwake"] = deviceGlobalConfigurations["keepDisplayAwake"];
+
                     if (payload["isSingleModeApp"] === true) {
                         payload["isSingleModeAppBuiltForKiosk"] =
                             deviceGlobalConfigurations["isSingleModeAppBuiltForKiosk"];
@@ -589,6 +591,7 @@ var androidOperationModule = function () {
                              operationData["isSingleModeAppBuiltForKiosk"];
                      }
                      deviceGlobalConfigurations["isIdleGraphicsEnabled"] = operationData["isIdleGraphicsEnabled"];
+                     deviceGlobalConfigurations["keepDisplayAwake"] = operationData["keepDisplayAwake"];
                      if (operationData["idleTimeout"]) {
                          deviceGlobalConfigurations["idleTimeout"] = operationData["idleTimeout"];
                      }
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index e82c1132a..804be22ba 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -2241,6 +2241,21 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <!--keep display awake configuration-->
+                                   <div class="wr-input-control">
+                                         <div class="wr-input-control sub-title panel-title"
+                                               style="padding: 0px; padding-right:15px; font-size:15px;">
+                                               Keep display awake
+                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"
+                                                      title="Keep display awake"></span>
+                                             <label class="wr-input-control checkbox">
+                                                  <input id="cosu-global-config-keep-display-awake" type="checkbox"
+                                                  class="form-control operationDataKeys cosu-profile-config"
+                                                  data-key="keepDisplayAwake"/>
+                                             <span class="helper"></span>
+                                         </label>
+                                    </div>
+                                    </div>
                                     <!--COSU profile user app configuration-->
                                     <div id="cosu-profile-user-app-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
index 77f5cef57..7391b308b 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
@@ -1690,6 +1690,21 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <!--keep display awake configuration-->
+                                    <div class="wr-input-control">
+                                          <div class="wr-input-control sub-title panel-title"
+                                                style="padding: 0px; padding-right:15px; font-size:15px;">
+                                                 Keep display awake
+                                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"
+                                                       title="Keep display awake"></span>
+                                          <label class="wr-input-control checkbox">
+                                                 <input id="cosu-global-config-keep-display-awake" type="checkbox"
+                                                        class="form-control operationDataKeys cosu-profile-config"
+                                                        data-key="keepDisplayAwake"/>
+                                                 <span class="helper"></span>
+                                          </label>
+                                    </div>
+                                    </div>
                                     <!--COSU profile user app configuration-->
                                     <div id="cosu-profile-user-app-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
index 2a4df56b1..c8202403f 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
@@ -1810,6 +1810,21 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <!--keep display awake configuration-->
+                                    <div class="wr-input-control">
+                                         <div class="wr-input-control sub-title panel-title"
+                                                    style="padding: 0px; padding-right:15px; font-size:15px;">
+                                                    Keep display awake
+                                              <span class="wr-help-tip glyphicon glyphicon-question-sign"
+                                                        title="Keep display awake"></span>
+                                              <label class="wr-input-control checkbox">
+                                              <input id="cosu-global-config-keep-display-awake" type="checkbox"
+                                                     class="form-control operationDataKeys cosu-profile-config"
+                                                     data-key="keepDisplayAwake" checked="checked"/>
+                                              <span class="helper"></span>
+                                              </label>
+                                         </div>
+                                    </div>
                                     <!--COSU profile user app configuration-->
                                     <div id="cosu-profile-user-app-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"