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.platform.configuration/configuration.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.platform.configuration/configuration.hbs
index 3e598fb0a..7e3708ed9 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.platform.configuration/configuration.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.platform.configuration/configuration.hbs
@@ -34,7 +34,7 @@
             </label>
             <select id="android-config-notifier" class="form-control" data-default="0">
                 <option value="1">Local Polling</option>
-                <option value="2">Google Cloud Messaging ( GCM )</option>
+                <option value="2">Firebase Cloud Messaging ( FCM )</option>
             </select>
         </div>
 
@@ -62,16 +62,6 @@
                 </label>
                 <input id="android-config-gcm-api-key" type="text" class="form-control" >
             </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="android-config-gcm-sender-id">
-                    Sender ID*
-                                                <span class="helper" title="GCM Sender ID">
-                                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                                </span>
-                </label>
-                <input id="android-config-gcm-sender-id" type="text" class="form-control">
-            </div>
         </div>
         <h4>
             End User License Agreement ( EULA )
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.platform.configuration/public/js/platform-configuration.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.platform.configuration/public/js/platform-configuration.js
index a179701e5..ec2af9639 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.platform.configuration/public/js/platform-configuration.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.platform.configuration/public/js/platform-configuration.js
@@ -124,8 +124,6 @@ $(document).ready(function () {
                         $("input#android-config-notifier-frequency").val(config.value / 1000);
                     } else if (config.name == configParams["GCM_API_KEY"]) {
                         $("input#android-config-gcm-api-key").val(config.value);
-                    } else if (config.name == configParams["GCM_SENDER_ID"]) {
-                        $("input#android-config-gcm-sender-id").val(config.value);
                     } else if (config.name == configParams["ANDROID_EULA"]) {
                         $("#android-eula").val(config.value);
                     }
@@ -159,7 +157,7 @@ $(document).ready(function () {
         var notifierType = $("#android-config-notifier").find("option:selected").attr("value");
         var notifierFrequency = $("input#android-config-notifier-frequency").val();
         var gcmAPIKey = $("input#android-config-gcm-api-key").val();
-        var gcmSenderId = $("input#android-config-gcm-sender-id").val();
+        var gcmSenderId = "sender_id";
         var androidLicense = tinyMCE.activeEditor.getContent();
         var errorMsgWrapper = "#android-config-error-msg";
         var errorMsg = "#android-config-error-msg span";
@@ -170,10 +168,7 @@ $(document).ready(function () {
             $(errorMsg).text("Provided notifier frequency is invalid. ");
             $(errorMsgWrapper).removeClass("hidden");
         } else if (notifierType == notifierTypeConstants["GCM"] && !gcmAPIKey) {
-            $(errorMsg).text("GCM API Key is a required field. It cannot be empty.");
-            $(errorMsgWrapper).removeClass("hidden");
-        } else if (notifierType == notifierTypeConstants["GCM"] && !gcmSenderId) {
-            $(errorMsg).text("GCM Sender ID is a required field. It cannot be empty.");
+            $(errorMsg).text("FCM API Key is a required field. It cannot be empty.");
             $(errorMsgWrapper).removeClass("hidden");
         } else {