diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000000..6824805503f
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,43 @@
+version: 2.1
+
+jobs:
+  test:
+    resource_class: buildpulse/bp-ubuntu-latest-x64-4x
+    docker:
+      - image: cimg/android:2025.01
+    steps:
+      - checkout
+
+      - run:
+          name: Set up JDK 17
+          command: |
+            sudo apt-get update
+            sudo apt-get install openjdk-17-jdk
+
+      - restore_cache:
+          keys:
+            - my-cache-2
+
+      - run:
+          name: Build with Gradle
+          command: ./gradlew qa
+
+      - run:
+          name: Archive reports for failed build
+          command: |
+            if [ $? -ne 0 ]; then
+              mkdir -p ~/reports
+              cp -r */build/reports/* ~/reports/
+            fi
+
+workflows:
+  version: 2
+  build-workflow:
+    jobs:
+      - test:
+          post-steps: # steps to run after steps defined in the job bar
+            - save_cache:
+                when: always
+                key: my-cache-2
+                paths:
+                  - .gradle/
diff --git a/.github/FUNDING.yml b/.github-old/FUNDING.yml
similarity index 100%
rename from .github/FUNDING.yml
rename to .github-old/FUNDING.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github-old/ISSUE_TEMPLATE/bug_report.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.yaml
rename to .github-old/ISSUE_TEMPLATE/bug_report.yaml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github-old/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/config.yml
rename to .github-old/ISSUE_TEMPLATE/config.yml
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github-old/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to .github-old/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/stale.yml b/.github-old/stale.yml
similarity index 100%
rename from .github/stale.yml
rename to .github-old/stale.yml
diff --git a/.github/workflows/android.yml b/.github-old/workflows/android.yml
similarity index 95%
rename from .github/workflows/android.yml
rename to .github-old/workflows/android.yml
index 0e63fceea41..1a37f506e8f 100644
--- a/.github/workflows/android.yml
+++ b/.github-old/workflows/android.yml
@@ -13,7 +13,7 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest-8-cores
+    runs-on: bp-ubuntu-latest-x64-4x
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/diffuse.yml b/.github-old/workflows/diffuse.yml
similarity index 98%
rename from .github/workflows/diffuse.yml
rename to .github-old/workflows/diffuse.yml
index 86afd230400..29dcc6f6f56 100644
--- a/.github/workflows/diffuse.yml
+++ b/.github-old/workflows/diffuse.yml
@@ -13,8 +13,8 @@ env:
 jobs:
   assemble-base:
     if: ${{ github.repository != 'signalapp/Signal-Android' }}
-    runs-on: ubuntu-latest-8-cores
-    
+    runs-on: bp-ubuntu-latest-x64-4x 
+
     steps:
     - uses: actions/checkout@v3
       with:
diff --git a/.github/workflows/docker.yml b/.github-old/workflows/docker.yml
similarity index 92%
rename from .github/workflows/docker.yml
rename to .github-old/workflows/docker.yml
index 59b6add10f2..45b3d2c094d 100644
--- a/.github/workflows/docker.yml
+++ b/.github-old/workflows/docker.yml
@@ -10,7 +10,7 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: bp-ubuntu-latest-x64-4x
 
     steps:
     - uses: actions/checkout@v3
diff --git a/gradle.properties b/gradle.properties
index 96ec9533d03..8c8db6b6ca3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx12g -Xms256m -XX:MaxMetaspaceSize=1g
+org.gradle.jvmargs=-Xmx2g -Xms256m -XX:MaxMetaspaceSize=1g
 android.useAndroidX=true
 android.experimental.androidTest.numManagedDeviceShards=4
 # We never want to use auto-provisioning, as it breaks reproducible builds.
diff --git a/gradlew b/gradlew
index 1b6c787337f..69c216d94da 100755
--- a/gradlew
+++ b/gradlew
@@ -86,7 +86,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx14g" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum