diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs
index f243c444f4..3d17d9a10f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs
@@ -1,5 +1,5 @@
 <tr data-type="selectable" data-deviceid="{{deviceTypeId}}" data-devicetype="{{deviceTypeName}}"
-    data-href="{{@app.context}}/device/{{deviceTypeName}}/enroll" class="clickable-row">
+    data-href="{{appContext}}/device/{{deviceTypeName}}/enroll" class="clickable-row">
     <td class="remove-padding icon-only content-fill" data-search="{{deviceCategory}}" data-display="{{deviceCategory}}">
         <div class="thumbnail icon">
                 <!--<i class="square-element text fw fw-mobile"></i>-->
@@ -9,7 +9,7 @@
     <td class="remove-padding-top" data-search="{{deviceTypeLabel}}" data-display="{{deviceTypeLabel}}">
         {{deviceTypeLabel}}</td>
     <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{@app.context}}/device/{{deviceTypeName}}/enroll"
+        <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
            data-click-event="remove-form" class="btn col-md-12">
                             <span class="fw-stack">
                                 <i class="fw fw-ring fw-stack-2x"></i>