diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index b695ed9f..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright (c) Yugabyte, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations
-# under the License.
-#
-
-version: 2.1
-
-jobs:
-  aarch64:
-    parameters:
-      archive_name_suffix:
-        type: string
-      docker_image:
-        type: string
-      build_thirdparty_args:
-        type: string
-        default: ""
-
-    machine:
-      image: ubuntu-2004:current
-      resource_class: arm.large
-
-    steps:
-      - checkout
-      - run:
-          name: Build YugabyteDB third-party dependencies
-          command: |
-            export YB_DOCKER_IMAGE="<< parameters.docker_image >>"
-            export YB_BUILD_THIRDPARTY_ARGS="<< parameters.build_thirdparty_args >>"
-            export YB_THIRDPARTY_ARCHIVE_NAME_SUFFIX="<< parameters.archive_name_suffix >>"
-            .github/workflows/github_actions_build.sh
-
-workflows:
-  build-release:
-    jobs:
-      # TODO: find a way to assign different names to each build.
-      # As specified below, they are named build-1, build-2, etc.
-
-      - aarch64:
-          archive_name_suffix: centos7-aarch64-clang16
-          docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
-          build_thirdparty_args: >-
-            --toolchain=llvm16
-            --expected-major-compiler-version=16
-            --skip-sanitizers
-
-      - aarch64:
-          archive_name_suffix: centos7-aarch64-clang16
-          docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
-          build_thirdparty_args: >-
-            --toolchain=llvm16
-            --expected-major-compiler-version=16
-            --skip-sanitizers
-
-      - aarch64:
-          archive_name_suffix: centos7-aarch64-clang16-full-lto
-          docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
-          build_thirdparty_args: >-
-            --toolchain=llvm16
-            --expected-major-compiler-version=16
-            --skip-sanitizers
-            --lto=full
-
-      - aarch64:
-          archive_name_suffix: amazonlinux2-aarch64-clang17
-          docker_image: yugabyteci/yb_build_infra_amazonlinux2_aarch64:v2024-04-25T17_55_13
-          build_thirdparty_args: >-
-            --toolchain=llvm17
-            --expected-major-compiler-version=17
-            --skip-sanitizers
-
-      - aarch64:
-          archive_name_suffix: centos7-aarch64-clang17
-          docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
-          build_thirdparty_args: >-
-            --toolchain=llvm17
-            --expected-major-compiler-version=17
-            --skip-sanitizers
-
-      - aarch64:
-          archive_name_suffix: amazonlinux2-aarch64-clang17-full-lto
-          docker_image: yugabyteci/yb_build_infra_amazonlinux2_aarch64:v2024-04-25T17_55_13
-          build_thirdparty_args: >-
-            --toolchain=llvm17
-            --expected-major-compiler-version=17
-            --skip-sanitizers
-            --lto=full
-
-      - aarch64:
-          archive_name_suffix: centos7-aarch64-clang17-full-lto
-          docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
-          build_thirdparty_args: >-
-            --toolchain=llvm17
-            --expected-major-compiler-version=17
-            --skip-sanitizers
-            --lto=full
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c213afe0..562758d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,6 +67,23 @@ jobs:
               --expected-major-compiler-version=16
               --lto=full
 
+          - name: centos7-aarch64-clang16
+            os: ubuntu-24.04-aarch64-4core-16gb
+            docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
+            build_thirdparty_args: >-
+              --toolchain=llvm16
+              --expected-major-compiler-version=16
+              --skip-sanitizers
+
+          - name: centos7-aarch64-clang16-full-lto
+            os: ubuntu-24.04-aarch64-4core-16gb
+            docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
+            build_thirdparty_args: >-
+              --toolchain=llvm16
+              --expected-major-compiler-version=16
+              --skip-sanitizers
+              --lto=full
+
           # Clang 17
           - name: centos7-x86_64-clang17
             os: ubuntu-20.04  # Ubuntu 20.04 is for the top-level VM only. We use Docker in it.
@@ -83,6 +100,23 @@ jobs:
               --expected-major-compiler-version=17
               --lto=full
 
+          - name: centos7-aarch64-clang17
+            os: ubuntu-24.04-aarch64-4core-16gb
+            docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
+            build_thirdparty_args: >-
+              --toolchain=llvm17
+              --expected-major-compiler-version=17
+              --skip-sanitizers
+
+          - name: centos7-aarch64-clang17-full-lto
+            os: ubuntu-24.04-aarch64-4core-16gb
+            docker_image: yugabyteci/yb_build_infra_centos7_aarch64:v2023-10-25T03_32_55
+            build_thirdparty_args: >-
+              --toolchain=llvm17
+              --expected-major-compiler-version=17
+              --skip-sanitizers
+              --lto=full
+
           # ---------------------------------------------------------------------------------------
           # Ubuntu 20.04
           # ---------------------------------------------------------------------------------------
@@ -214,6 +248,22 @@ jobs:
               --toolchain=llvm17
               --expected-major-compiler-version=17
 
+          - name: amazonlinux2-aarch64-clang17
+            os: ubuntu-24.04-aarch64-4core-16gb
+            docker_image: yugabyteci/yb_build_infra_amazonlinux2_aarch64:v2024-04-25T17_55_13
+            build_thirdparty_args: >-
+              --toolchain=llvm17
+              --expected-major-compiler-version=17
+              --skip-sanitizers
+
+          - name: amazonlinux2-aarch64-clang17-full-lto
+            os: ubuntu-24.04-aarch64-4core-16gb
+            docker_image: yugabyteci/yb_build_infra_amazonlinux2_aarch64:v2024-04-25T17_55_13
+            build_thirdparty_args: >-
+              --toolchain=llvm17
+              --expected-major-compiler-version=17
+              --skip-sanitizers
+              --lto=full
 
           # ---------------------------------------------------------------------------------------
           # macOS