diff --git a/config.xml b/config.xml
index 265b5a0a5..c3f6a820d 100644
--- a/config.xml
+++ b/config.xml
@@ -139,9 +139,9 @@
     <plugin name="cordova-plugin-zip" spec="^3.1.0" />
     <plugin name="cordova-sqlite-storage" spec="^2.6.0" />
     <plugin name="nl.kingsquare.cordova.background-audio" spec="^1.0.1" />
-    <plugin name="phonegap-plugin-push" spec="^2.2.3">
+    <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v2">
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
-        <variable name="FCM_VERSION" value="11.6.2" />
+        <variable name="FCM_VERSION" value="17.0.+" />
     </plugin>
     <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" android:debuggable="true" />
diff --git a/package-lock.json b/package-lock.json
index 8b112c0e9..ffdf940d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3226,9 +3226,9 @@
       "integrity": "sha512-4ihQApBGVKR1QZ4oOSGctKFfthtCfiWMTcIIfxe97vKxlvGr9NyXOvYG9vXU9S7yVR7Ua+Rj47hkE7pQIKvQTg=="
     },
     "cordova-support-google-services": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.1.0.tgz",
-      "integrity": "sha1-RjTFIgD4cGDReV6yhw6ZRC12Lm0="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.2.1.tgz",
+      "integrity": "sha512-EnFjKAE9oI2uzyUvEfWpLgTM200nuJVvShaA4yyz9wMKBUN+H/BRG1byd1ibZz3sSihNKi3FxjQPxmmEn6/IfA=="
     },
     "core-js": {
       "version": "2.3.0",
@@ -8575,9 +8575,8 @@
       "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
     },
     "phonegap-plugin-push": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3.tgz",
-      "integrity": "sha512-5mjT0G1vfRhXVnZFLwjfzcFwYjVRMibgYDCfYvEujGsP8YwwrIIzcf+xBYAjQV/W2JCjzuNaYd7xJ0yVQaPeig==",
+      "version": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#9b1d9fe575d1f21b517327c480e7fe0f73280e7a",
+      "from": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v2",
       "requires": {
         "babel-plugin-add-header-comment": "^1.0.3",
         "install": "^0.8.2"
diff --git a/package.json b/package.json
index 4ffaa3c37..2fa23a48a 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "cordova-plugin-whitelist": "^1.3.3",
     "cordova-plugin-zip": "^3.1.0",
     "cordova-sqlite-storage": "^2.6.0",
-    "cordova-support-google-services": "^1.1.0",
+    "cordova-support-google-services": "^1.2.1",
     "es6-promise-plugin": "^4.2.2",
     "font-awesome": "^4.7.0",
     "ionic-angular": "3.9.3",
@@ -111,7 +111,7 @@
     "moment": "^2.22.2",
     "nl.kingsquare.cordova.background-audio": "^1.0.1",
     "phonegap-plugin-multidex": "^1.0.0",
-    "phonegap-plugin-push": "^2.2.3",
+    "phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v2",
     "promise.prototype.finally": "^3.1.0",
     "rxjs": "^5.5.11",
     "sw-toolbox": "^3.6.0",
@@ -172,7 +172,7 @@
       "nl.kingsquare.cordova.background-audio": {},
       "phonegap-plugin-push": {
         "ANDROID_SUPPORT_V13_VERSION": "27.+",
-        "FCM_VERSION": "11.6.2"
+        "FCM_VERSION": "17.0.+"
       }
     }
   },