diff --git a/package-lock.json b/package-lock.json
index 89128236b..513cc3cb2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3752,6 +3752,39 @@
         }
       }
     },
+    "@moodlehq/cordova-plugin-file-transfer": {
+      "version": "1.7.1-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1-moodle.2.tgz",
+      "integrity": "sha512-nvddQelAwPXmvjv0YJJwuf2xFNi78ZmTa47BgtHGebOvdKpmcbphkOQAVN7KMheL4J3KNE9DbMBHwEHkGGkH4g=="
+    },
+    "@moodlehq/cordova-plugin-inappbrowser": {
+      "version": "5.0.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0-moodle.2.tgz",
+      "integrity": "sha512-0JOLHUFEJC3fv4OQuyr2kwNyrb7oeyjmfFLQ+LcKO41e6UOnNy/du0hU7Yz9Rh8B2zGcebvSwMrN+cRSCqlipQ=="
+    },
+    "@moodlehq/cordova-plugin-local-notification": {
+      "version": "0.9.0-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-moodle.2.tgz",
+      "integrity": "sha512-enK/jcbXrnSFJt8TS2drb/5uUOpsTYbUqjI3pYgvogKdP5k5JOnT0xtW54Arlpl5RphcINx733OuXHRJAED2Ow=="
+    },
+    "@moodlehq/cordova-plugin-qrscanner": {
+      "version": "3.0.1-moodle.2",
+      "resolved": "https://registry.npmjs.org/@moodlehq/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1-moodle.2.tgz",
+      "integrity": "sha512-bjMI94QTEaUOl5TbK8K+HZI3gcR8HHfYTocsA1/C1HMKD3nROhGtwvuVDNvb+ogknv9WVQDyGnfMAnNihYH+PQ==",
+      "requires": {
+        "qrcode-reader": "^1.0.4",
+        "webrtc-adapter": "^3.1.4"
+      }
+    },
+    "@moodlehq/phonegap-plugin-push": {
+      "version": "2.2.3-moodle.1",
+      "resolved": "https://registry.npmjs.org/@moodlehq/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3-moodle.1.tgz",
+      "integrity": "sha512-LxHz0nPIvxhRgjvj8QRTdhuMtb+NNbFsaAh7JS6q9Ag0lt3LkKrGwCoMr/rTfhfCLj+mrIhyLUv/mo8oPmHeeg==",
+      "requires": {
+        "babel-plugin-add-header-comment": "^1.0.3",
+        "install": "^0.8.2"
+      }
+    },
     "@netflix/nerror": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz",
@@ -4034,14 +4067,6 @@
       "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
-    "@types/cordova-plugin-file-transfer": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@types/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.6.2.tgz",
-      "integrity": "sha512-jWZQefyVn/GiQAdummRoY1v5cUY4dT7GNk3Hg40iUtL68y40jKWD3ALAtMM4pnYt9RSMTlsgs1I7/apXexddvw==",
-      "requires": {
-        "cordova-plugin-file-transfer": "*"
-      }
-    },
     "@types/dom-mediacapture-record": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.7.tgz",
@@ -8062,10 +8087,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-file-opener2/-/cordova-plugin-file-opener2-3.0.5.tgz",
       "integrity": "sha512-tjLHDamH5+y0bJZYVe2967L1S4R8tL4Y0rJUzJGoxsyiw3FUlrJNS199POOpzZZ6Xhlntn9a2o7+84r1dMN21A=="
     },
-    "cordova-plugin-file-transfer": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-file-transfer.git#648b57792f2f33ffc9da6d2fa020d26a48799048",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-file-transfer.git"
-    },
     "cordova-plugin-geolocation": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.1.0.tgz",
@@ -8076,10 +8097,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
       "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4="
     },
-    "cordova-plugin-inappbrowser": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-inappbrowser.git#a1ac936fd79596fd5841bd424cc782ee84e4a290",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-inappbrowser.git#moodle-ionic5"
-    },
     "cordova-plugin-ionic-keyboard": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
@@ -8090,10 +8107,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0.tgz",
       "integrity": "sha512-Wq0kCanxubK/JroTW4Mp5soayScnRyiY1eCkbwiz1Dyt1xHOiOW/v+1miqtBHtnZhcXw25TulCKAVJzkNBdmyg=="
     },
-    "cordova-plugin-local-notification": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#0bb96b757fb484553ceabf35a59802f7983a2836",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle"
-    },
     "cordova-plugin-media": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/cordova-plugin-media/-/cordova-plugin-media-5.0.3.tgz",
@@ -8110,17 +8123,9 @@
       "integrity": "sha512-NwO3qDBNL/vJxUxBTPNOA1HvkDf9eTeGH8JSZiwy1jq2W2mJKQEDBwqWkaEQS19Yd/MQTiw0cykxg5D7u4J6cQ=="
     },
     "cordova-plugin-prevent-override": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-prevent-override.git#49507eda3c929e488e58b8402cfc7e1521ebc400",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-prevent-override.git",
-      "dev": true
-    },
-    "cordova-plugin-qrscanner": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-qrscanner.git#857efee3a7a49104faabd108ff1f00a57d3aca94",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-qrscanner.git#dist",
-      "requires": {
-        "qrcode-reader": "^1.0.4",
-        "webrtc-adapter": "^3.1.4"
-      }
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-prevent-override/-/cordova-plugin-prevent-override-1.0.0.tgz",
+      "integrity": "sha512-/+3q5r4K5RahCpiYVmZQBjq10x4jj+6CMjYtZyx9jdMWeV+yFE+ItFcO1NeUAEWd2iHC5YPD0P2tHiHx5kscsw=="
     },
     "cordova-plugin-screen-orientation": {
       "version": "3.0.2",
@@ -8143,12 +8148,14 @@
       "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
     },
     "cordova-plugin-wkuserscript": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-wkuserscript.git#aa77d0f98a3fb106f2e798e5adf5882f01a2c947",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-wkuserscript.git"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkuserscript/-/cordova-plugin-wkuserscript-1.0.0.tgz",
+      "integrity": "sha512-g18TohV1T+iWQJImYUCZc44x2ywHTH3ycgEJyxo4WTL9eYm4T7lNkyl1svzQGI97e8W5hQxUqAcmvpVcnWvjSQ=="
     },
     "cordova-plugin-wkwebview-cookies": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies.git#8c3a289e29b33edecff15f470c1630baf4ec3e88",
-      "from": "git+https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies.git"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-cookies/-/cordova-plugin-wkwebview-cookies-1.0.0.tgz",
+      "integrity": "sha512-bQRnc/1UNu2XDb6ds+RuAZGA8FM2MuQb4z45J/CaDfjSs60OSvxGVKo3okrM/okYosZqWJFygrPah0MK3lDERQ=="
     },
     "cordova-plugin-zip": {
       "version": "3.1.0",
@@ -8181,9 +8188,9 @@
       "integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
     },
     "cordova-support-google-services": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.3.2.tgz",
-      "integrity": "sha512-RtEWzULreUX662MFWopGhFispLiHX7gUf2GijPOC2mY2oCNuUobj2mO4tl5q7PYbOreSxq+PrSekhmS6TAAWdw=="
+      "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=="
     },
     "cordova.plugins.diagnostic": {
       "version": "5.0.2",
@@ -17308,14 +17315,6 @@
       "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz",
       "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
     },
-    "phonegap-plugin-push": {
-      "version": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#cb332d5ec8a1a0d43916fc6d35455fe6bea7a7f9",
-      "from": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3",
-      "requires": {
-        "babel-plugin-add-header-comment": "^1.0.3",
-        "install": "^0.8.2"
-      }
-    },
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
diff --git a/package.json b/package.json
index 01beb7354..1025d3190 100644
--- a/package.json
+++ b/package.json
@@ -71,11 +71,15 @@
     "@ionic-native/web-intent": "5.33.0",
     "@ionic-native/zip": "5.33.0",
     "@ionic/angular": "5.6.6",
+    "@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
+    "@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
+    "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
+    "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
+    "@moodlehq/phonegap-plugin-push": "2.2.3-moodle.1",
     "@ngx-translate/core": "13.0.0",
     "@ngx-translate/http-loader": "6.0.0",
     "@types/chart.js": "2.9.31",
     "@types/cordova": "0.0.34",
-    "@types/cordova-plugin-file-transfer": "1.6.2",
     "@types/dom-mediacapture-record": "1.0.7",
     "chart.js": "2.9.4",
     "com-darryncampbell-cordova-plugin-intent": "1.3.0",
@@ -93,26 +97,23 @@
     "cordova-plugin-device": "2.0.3",
     "cordova-plugin-file": "6.0.2",
     "cordova-plugin-file-opener2": "3.0.5",
-    "cordova-plugin-file-transfer": "git+https://github.com/moodlemobile/cordova-plugin-file-transfer.git",
     "cordova-plugin-geolocation": "4.1.0",
     "cordova-plugin-globalization": "1.11.0",
-    "cordova-plugin-inappbrowser": "git+https://github.com/moodlemobile/cordova-plugin-inappbrowser.git#moodle-ionic5",
     "cordova-plugin-ionic-keyboard": "2.2.0",
     "cordova-plugin-ionic-webview": "5.0.0",
-    "cordova-plugin-local-notification": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle",
     "cordova-plugin-media": "5.0.3",
     "cordova-plugin-media-capture": "3.0.3",
     "cordova-plugin-network-information": "2.0.2",
-    "cordova-plugin-qrscanner": "git+https://github.com/moodlemobile/cordova-plugin-qrscanner.git#dist",
+    "cordova-plugin-prevent-override": "1.0.0",
     "cordova-plugin-screen-orientation": "3.0.2",
     "cordova-plugin-splashscreen": "6.0.0",
     "cordova-plugin-statusbar": "2.4.3",
     "cordova-plugin-whitelist": "1.3.4",
-    "cordova-plugin-wkuserscript": "git+https://github.com/moodlemobile/cordova-plugin-wkuserscript.git",
-    "cordova-plugin-wkwebview-cookies": "git+https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies.git",
+    "cordova-plugin-wkuserscript": "1.0.0",
+    "cordova-plugin-wkwebview-cookies": "1.0.0",
     "cordova-plugin-zip": "3.1.0",
     "cordova-sqlite-storage": "6.0.0",
-    "cordova-support-google-services": "1.3.2",
+    "cordova-support-google-services": "1.2.1",
     "cordova.plugins.diagnostic": "5.0.2",
     "core-js": "3.9.1",
     "es6-promise-plugin": "4.2.2",
@@ -121,7 +122,6 @@
     "moment": "2.29.0",
     "nl.kingsquare.cordova.background-audio": "1.0.1",
     "phonegap-plugin-multidex": "1.0.0",
-    "phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3",
     "rxjs": "6.5.5",
     "ts-md5": "1.2.7",
     "tslib": "2.0.1",
@@ -148,7 +148,6 @@
     "@typescript-eslint/eslint-plugin": "4.22.0",
     "@typescript-eslint/parser": "4.22.0",
     "check-es-compat": "1.1.1",
-    "cordova-plugin-prevent-override": "git+https://github.com/moodlemobile/cordova-plugin-prevent-override.git",
     "eslint": "7.25.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-header": "3.1.1",
@@ -203,10 +202,10 @@
       "cordova-plugin-geolocation": {
         "GPS_REQUIRED": "false"
       },
-      "cordova-plugin-inappbrowser": {},
+      "@moodlehq/cordova-plugin-inappbrowser": {},
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-ionic-webview": {},
-      "cordova-plugin-local-notification": {
+      "@moodlehq/cordova-plugin-local-notification": {
         "ANDROID_SUPPORT_V4_VERSION": "26.+"
       },
       "cordova-plugin-media-capture": {},
@@ -214,7 +213,7 @@
         "KEEP_AVAUDIOSESSION_ALWAYS_ACTIVE": "NO"
       },
       "cordova-plugin-network-information": {},
-      "cordova-plugin-qrscanner": {},
+      "@moodlehq/cordova-plugin-qrscanner": {},
       "cordova-plugin-screen-orientation": {},
       "cordova-plugin-splashscreen": {},
       "cordova-plugin-statusbar": {},
@@ -223,7 +222,7 @@
       "cordova-plugin-wkwebview-cookies": {},
       "cordova-plugin-zip": {},
       "cordova-sqlite-storage": {},
-      "phonegap-plugin-push": {
+      "@moodlehq/phonegap-plugin-push": {
         "ANDROID_SUPPORT_V13_VERSION": "27.+",
         "FCM_VERSION": "17.0.+"
       },
@@ -236,7 +235,7 @@
         "ANDROID_SUPPORT_VERSION": "28.+"
       },
       "cordova-plugin-globalization": {},
-      "cordova-plugin-file-transfer": {},
+      "@moodlehq/cordova-plugin-file-transfer": {},
       "cordova-plugin-prevent-override": {}
     }
   },
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 67b984831..fec951fbe 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -3,8 +3,8 @@
   "compilerOptions": {
     "outDir": "./out-tsc/app",
     "types": [
-      "cordova-plugin-file-transfer",
-      "cordova-plugin-inappbrowser",
+      "@moodlehq/cordova-plugin-file-transfer",
+      "@moodlehq/cordova-plugin-inappbrowser",
       "cordova",
       "dom-mediacapture-record",
       "node",
diff --git a/tsconfig.json b/tsconfig.json
index 700301d46..d617cbf05 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,8 +20,8 @@
       "dom"
     ],
     "types": [
-        "cordova-plugin-file-transfer",
-        "cordova-plugin-inappbrowser",
+        "@moodlehq/cordova-plugin-file-transfer",
+        "@moodlehq/cordova-plugin-inappbrowser",
         "cordova",
         "dom-mediacapture-record",
         "faker",
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 58fd560d7..96425dace 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -6,8 +6,8 @@
     "esModuleInterop": true,
     "emitDecoratorMetadata": true,
     "types": [
-      "cordova-plugin-file-transfer",
-      "cordova-plugin-inappbrowser",
+      "@moodlehq/cordova-plugin-file-transfer",
+      "@moodlehq/cordova-plugin-inappbrowser",
       "cordova",
       "dom-mediacapture-record",
       "faker",