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 e4bd32974..fe820ecc3 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
@@ -211,6 +211,10 @@ var androidOperationModule = function () {
                     payload["kioskLogoImage"] = deviceGlobalConfigurations["kioskLogoImage"];
                     payload["kioskAppName"] = deviceGlobalConfigurations["kioskAppName"];
                     payload["isSingleModeApp"] = deviceGlobalConfigurations["isSingleModeApp"];
+                    if (payload["isSingleModeApp"] === true) {
+                        payload["isSingleModeAppBuiltForKiosk"] =
+                            deviceGlobalConfigurations["isSingleModeAppBuiltForKiosk"];
+                    }
                     payload["isIdleGraphicsEnabled"] = deviceGlobalConfigurations["isIdleGraphicsEnabled"];
                     payload["idleTimeout"] = deviceGlobalConfigurations["idleTimeout"];
                     payload["isMultiUserDevice"] = deviceGlobalConfigurations["isMultiUserDevice"];
@@ -515,6 +519,8 @@ var androidOperationModule = function () {
                              deviceGlobalConfigurations["singleModeApp"]
                                  = $(selectedSingleModeAppElement + "[data-child-key='packageName']").val();
                          }
+                         deviceGlobalConfigurations["isSingleModeAppBuiltForKiosk"] =
+                             operationData["isSingleModeAppBuiltForKiosk"];
                      }
                      deviceGlobalConfigurations["isIdleGraphicsEnabled"] = operationData["isIdleGraphicsEnabled"];
                      if (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 2d0318501..bcbe19cad 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
@@ -1722,26 +1722,45 @@
                                                class="form-control operationDataKeys"  data-key="kioskAppName"
                                                maxlength="100" placeholder="Name to appear on the agent"/>
                                     </div>
-                                    <div>
-                                        <ul class="message message-info">
-                                            <i class="icon fw fw-info"></i>
-                                            Selected initial app in
-                                            <strong>Enrollment Application Install policy config</strong>
-                                            will be selected for single application mode
-                                        </ul>
-                                    </div>
-                                    <div class="wr-input-control">
-                                        <label class="wr-input-control checkbox">
-                                            <input id="cosu-global-config-is-single-application-mode" type="checkbox"
-                                                   class="form-control operationDataKeys"
-                                                   data-key="isSingleModeApp"/>
-                                            <span class="helper">
+                                    <!--COSU single mode application-->
+                                    <div id="cosu-profile-single-mode-app-configuration" class="panel">
+                                        <div class="wr-input-control sub-title panel-title"
+                                             style="padding: 0px; padding-right:15px; font-size:15px;">
                                             Is single application mode
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"
                                                   title="Is single application mode"></span>
-                                        </span>
-                                        </label>
+                                            <label class="wr-input-control checkbox">
+                                                <input id="cosu-global-config-is-single-application-mode" type="checkbox"
+                                                       class="form-control operationDataKeys"
+                                                       data-key="isSingleModeApp"
+                                                       onchange="changeDivVisibility('single-mode-kiosk-app', this)"/>
+                                                <span class="helper"></span>
+                                            </label>
+                                        </div>
+                                        <div id="single-mode-kiosk-app" class="panel-collapse panel-body collapse-config"
+                                             role="tabpanel" style="display: none;" >
+                                            <div>
+                                                <ul class="message message-info">
+                                                    <i class="icon fw fw-info"></i>
+                                                    Selected initial app in
+                                                    <strong>Enrollment Application Install policy config</strong>
+                                                    will be selected for single application mode
+                                                </ul>
+                                            </div>
+                                            <div class="wr-input-control">
+                                                <label class="wr-input-control checkbox">
+                                                    <input id="cosu-profile-single-mode-is-kiosk-app" type="checkbox"
+                                                           class="form-control operationDataKeys"
+                                                           data-key="isSingleModeAppBuiltForKiosk" checked="checked"/>
+                                                    <span class="helper" title="Is single mode app built for Kiosk. Enable if lock task method is called in the application">
+                                                        Is application built for Kiosk
+                                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                                    </span>
+                                                </label>
+                                            </div>
+                                        </div>
                                     </div>
+                                    <!--COSU single mode application-->
                                     <div id="cosu-profile-idle-media-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"
                                              style="padding: 0px; padding-right:15px; font-size:15px;">
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 d169203e5..75829fefa 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
@@ -1327,26 +1327,46 @@
                                                class="form-control operationDataKeys" data-key="kioskAppName"
                                                maxlength="100" placeholder="Name to appear on the agent" disabled/>
                                     </div>
-                                    <div>
-                                        <ul class="message message-info">
-                                            <i class="icon fw fw-info"></i>
-                                            Selected initial app in
-                                            <strong>Enrollment Application Install policy config</strong>
-                                            will be selected for single application mode
-                                        </ul>
-                                    </div>
-                                    <div class="wr-input-control">
-                                        <label class="wr-input-control checkbox">
-                                            <input id="cosu-global-config-is-single-application-mode" type="checkbox"
-                                                   class="form-control operationDataKeys"
-                                                   data-key="isSingleModeApp" disabled/>
-                                            <span class="helper">
+                                    <!--COSU single mode application-->
+                                    <div id="cosu-profile-single-mode-app-configuration" class="panel">
+                                        <div class="wr-input-control sub-title panel-title"
+                                             style="padding: 0px; padding-right:15px; font-size:15px;">
                                             Is single application mode
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"
                                                   title="Is single application mode"></span>
-                                        </span>
-                                        </label>
+                                            <label class="wr-input-control checkbox">
+                                                <input id="cosu-global-config-is-single-application-mode" type="checkbox"
+                                                       class="form-control operationDataKeys"
+                                                       data-key="isSingleModeApp" disabled
+                                                       onchange="changeDivVisibility('single-mode-kiosk-app', this)"/>
+                                                <span class="helper"></span>
+                                            </label>
+                                        </div>
+                                        <div id="single-mode-kiosk-app" class="panel-collapse panel-body collapse-config"
+                                             role="tabpanel" style="display: none;" >
+                                            <div>
+                                                <ul class="message message-info">
+                                                    <i class="icon fw fw-info"></i>
+                                                    Selected initial app in
+                                                    <strong>Enrollment Application Install policy config</strong>
+                                                    will be selected for single application mode
+                                                </ul>
+                                            </div>
+                                            <div class="wr-input-control">
+                                                <label class="wr-input-control checkbox">
+                                                    <input id="cosu-profile-single-mode-is-kiosk-app" type="checkbox"
+                                                           class="form-control operationDataKeys"
+                                                           data-key="isSingleModeAppBuiltForKiosk"
+                                                           checked="checked" disabled/>
+                                                    <span class="helper" title="Is single mode app built for Kiosk. Enable if lock task method is called in the application">
+                                                        Is application built for Kiosk
+                                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                                    </span>
+                                                </label>
+                                            </div>
+                                        </div>
                                     </div>
+                                    <!--COSU single mode application-->
                                     <div id="cosu-profile-idle-media-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"
                                              style="padding: 0px; padding-right:15px; font-size:15px;">
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 c6d8c6311..1c0380836 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
@@ -1453,26 +1453,45 @@
                                                class="form-control operationDataKeys"  data-key="kioskAppName"
                                                maxlength="100" placeholder="Name to appear on the agent"/>
                                     </div>
-                                    <div>
-                                        <ul class="message message-info">
-                                            <i class="icon fw fw-info"></i>
-                                            Selected initial app in
-                                            <strong>Enrollment Application Install policy config</strong>
-                                            will be selected for single application mode
-                                        </ul>
-                                    </div>
-                                    <div class="wr-input-control">
-                                        <label class="wr-input-control checkbox">
-                                            <input id="cosu-global-config-is-single-application-mode" type="checkbox"
-                                                   class="form-control operationDataKeys"
-                                                   data-key="isSingleModeApp"/>
-                                            <span class="helper">
+                                    <!--COSU single mode application-->
+                                    <div id="cosu-profile-single-mode-app-configuration" class="panel">
+                                        <div class="wr-input-control sub-title panel-title"
+                                             style="padding: 0px; padding-right:15px; font-size:15px;">
                                             Is single application mode
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"
                                                   title="Is single application mode"></span>
-                                        </span>
-                                        </label>
+                                            <label class="wr-input-control checkbox">
+                                                <input id="cosu-global-config-is-single-application-mode" type="checkbox"
+                                                       class="form-control operationDataKeys"
+                                                       data-key="isSingleModeApp"
+                                                       onchange="changeDivVisibility('single-mode-kiosk-app', this)"/>
+                                                <span class="helper"></span>
+                                            </label>
+                                        </div>
+                                        <div id="single-mode-kiosk-app" class="panel-collapse panel-body collapse-config"
+                                             role="tabpanel" style="display: none;" >
+                                            <div>
+                                                <ul class="message message-info">
+                                                    <i class="icon fw fw-info"></i>
+                                                    Selected initial app in
+                                                    <strong>Enrollment Application Install policy config</strong>
+                                                    will be selected for single application mode
+                                                </ul>
+                                            </div>
+                                            <div class="wr-input-control">
+                                                <label class="wr-input-control checkbox">
+                                                    <input id="cosu-profile-single-mode-is-kiosk-app" type="checkbox"
+                                                           class="form-control operationDataKeys"
+                                                           data-key="isSingleModeAppBuiltForKiosk" checked="checked"/>
+                                                    <span class="helper" title="Is single mode app built for Kiosk. Enable if lock task method is called in the application">
+                                                        Is application built for Kiosk
+                                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                                    </span>
+                                                </label>
+                                            </div>
+                                        </div>
                                     </div>
+                                    <!--COSU single mode application-->
                                     <div id="cosu-profile-idle-media-configuration" class="panel">
                                         <div class="wr-input-control sub-title panel-title"
                                                 style="padding: 0px; padding-right:15px; font-size:15px;">