diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index d1e2a48..611e549 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -15,7 +15,8 @@ jobs:
   build-apk-pr-check:
     uses: ./.github/workflows/build-artifact.yml
     with:
-      FILES_TO_EXPECT: 3
+      FILES_TO_EXPECT: 16
     secrets:
       ENVS: |
-        PATCH_APPS=youtube_music,twitter
+        CI_TEST=True
+        ES_JAVA_OPTS: '-Xms4g -Xmx4g'
diff --git a/README.md b/README.md
index f3f8706..c5e89d9 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
 # 🤓Docker-Py-ReVanced
 
-A little python script that will help you in building Revanced and Revanced-Extended [apps](#note)
+A little python script that will help you in building Revanced and Revanced-Extended [apps](#note).
 
-Note - ~~I prefer [Revanced Extended](https://github.com/inotia00/revanced-patches/tree/revanced-extended) more
+This is just a builder for revanced and not a revanced support. Please be understanding and refraining from asking
+about revanced features/bugs. Discuss those on proper relevant forums(on Revanced GitHub , Discord)
+
+Note - I prefer [Revanced Extended](https://github.com/inotia00/revanced-patches/tree/revanced-extended) more
 (for YouTube & YouTube Music) hence the YouTube and YouTube Music builds in this repo are from
-Revanced Extended.~~
+Revanced Extended.
 
 ## Pre-Built APKs
 
diff --git a/apks/options.toml b/apks/options.toml
index 347a8a5..cbd971a 100644
--- a/apks/options.toml
+++ b/apks/options.toml
@@ -2,6 +2,6 @@
 websiteURL = "https://t.me/revanced_apkss"
 websiteSummary = "Visit Revanced Builder Channel"
 
-[website-music]
+['website-music']
 websiteURL = "https://t.me/revanced_apkss"
 websiteSummary = "Visit Revanced Builder Channel"
diff --git a/src/config.py b/src/config.py
index 7a89421..f6a24fc 100644
--- a/src/config.py
+++ b/src/config.py
@@ -5,7 +5,7 @@ from typing import Dict, List
 from environs import Env
 from requests import Session
 
-from src.utils import default_build
+from src.utils import all_builds, default_build
 
 
 class RevancedConfig:
@@ -28,7 +28,10 @@ class RevancedConfig:
         self.apk_pure = ["hex-editor"]
         self.apk_sos = ["expensemanager"]
         self.keystore_name = env.str("KEYSTORE_FILE_NAME", "revanced.keystore")
-        self.apps = env.list("PATCH_APPS", default_build)
+        self.ci_test = env.bool("CI_TEST", False)
+        self.apps = env.list(
+            "PATCH_APPS", all_builds if self.ci_test else default_build
+        )
         self.extended_apps: List[str] = ["youtube", "youtube_music"]
         self.rip_libs_apps: List[str] = ["youtube"]
         self.normal_cli_jar = "revanced-cli.jar"
diff --git a/src/parser.py b/src/parser.py
index 3f8d15d..0316166 100644
--- a/src/parser.py
+++ b/src/parser.py
@@ -64,6 +64,12 @@ class Parser(object):
         except ValueError:
             return False
 
+    def exclude_all_patches(self) -> None:
+        """Exclude all patches to Speed up CI."""
+        for idx, item in enumerate(self._PATCHES):
+            if item == "-i":
+                self._PATCHES[idx] = "-e"
+
     # noinspection IncorrectFormatting
     def patch_app(
         self,
@@ -107,7 +113,8 @@ class Parser(object):
             logger.debug("Using experimental features")
             args.append("--experimental")
         args[1::2] = map(lambda i: self.config.temp_folder.joinpath(i), args[1::2])
-
+        if self.config.ci_test:
+            self.exclude_all_patches()
         if self._PATCHES:
             args.extend(self._PATCHES)
         if (
diff --git a/src/utils.py b/src/utils.py
index 98741dc..e66c109 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -4,6 +4,24 @@ from typing import Dict
 default_build = [
     "youtube",
 ]
+all_builds = [
+    "youtube",
+    "youtube_music",
+    "twitter",
+    "reddit",
+    # "tiktok", # Commented because of out of memory issues
+    "warnwetter",
+    "spotify",
+    "nyx-music-player",
+    "icon_pack_studio",
+    "ticktick",
+    "twitch",
+    "hex-editor",
+    "citra",
+    "windy",
+    "my-expenses",
+    "backdrops",
+]
 possible_archs = ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]