diff --git a/opengapps.xml b/opengapps.xml
new file mode 100644
index 0000000..f365602
--- /dev/null
+++ b/opengapps.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+<remote name="opengapps" fetch="https://gitlab.opengapps.org/opengapps/"  />
+<remote name="opengappsold" fetch="http://github.com/opengapps/"  />
+
+<project path="vendor/opengapps/build" name="aosp_build" revision="master" remote="opengappsold" />
+<project path="vendor/opengapps/sources/all" name="all" clone-depth="1" revision="master" remote="opengapps" />
+
+<!-- arm64 depends on arm -->
+<project path="vendor/opengapps/sources/arm" name="arm" clone-depth="1" revision="master" remote="opengapps" />
+<project path="vendor/opengapps/sources/arm64" name="arm64" clone-depth="1" revision="master" remote="opengapps" />
+
+<project path="vendor/opengapps/sources/x86" name="x86" clone-depth="1" revision="master" remote="opengapps" />
+<project path="vendor/opengapps/sources/x86_64" name="x86_64" clone-depth="1" revision="master" remote="opengapps" />
+</manifest>
diff --git a/pe_gapps.xml b/pe_gapps.xml
deleted file mode 100644
index f1b8a42..0000000
--- a/pe_gapps.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-<remote name="pe" fetch="https://gitlab.com/PixelExperience/"  />
-
-<project path="vendor/gapps/" name="vendor_gapps" revision="84ad3aa0967f969b58ee1edb01a9e21e5a621d1a" upstream="ten" remote="pe" />
-
-</manifest>