diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
index 4038101a28b..fd0bf3fe147 100644
--- a/.circleci/Dockerfiles/Dockerfile.android
+++ b/.circleci/Dockerfiles/Dockerfile.android
@@ -33,17 +33,11 @@ ADD React /app/React
 ADD keystores /app/keystores
 ADD packages/react-native-codegen /app/packages/react-native-codegen
 ADD tools /app/tools
-add scripts /app/scripts
+ADD scripts /app/scripts
 
 WORKDIR /app
 
-RUN scripts/download-kotlin-compiler-with-buck.sh
-
-RUN buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
-RUN buck fetch ReactAndroid/src/main/java/com/facebook/react
-RUN buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
-RUN buck fetch ReactAndroid/src/test/...
-RUN buck fetch ReactAndroid/src/androidTest/...
+RUN scripts/buck/buck_fetch.sh
 
 RUN buck build ReactAndroid/src/main/java/com/facebook/react
 RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 768337f5995..950fe614432 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -681,7 +681,7 @@ jobs:
 
       - run:
           name: Download Dependencies Using Buck
-          command: ./scripts/circleci/buck_fetch.sh
+          command: ./scripts/buck/buck_fetch.sh
 
       - run:
           name: Build & Test React Native using Buck
@@ -754,6 +754,18 @@ jobs:
             - run_e2e:
                 platform: android
 
+  # -------------------------
+  #    JOBS: Test Android Docker Image
+  # -------------------------
+  test_android_docker_image:
+    machine:
+      image: ubuntu-2004:202010-01
+    steps:
+      - checkout
+      - run:
+          name: Try to build React Native inside the Docker Container
+          command: npm run docker-build-android
+
   # -------------------------
   #    JOBS: Test Android Template
   # -------------------------
@@ -1603,6 +1615,7 @@ workflows:
           run_disabled_tests: false
       - test_android:
           run_disabled_tests: false
+      - test_android_docker_image
       - test_android_template:
           requires:
             - build_npm_package
diff --git a/.github/workflows/test-docker-android.yml b/.github/workflows/test-docker-android.yml
deleted file mode 100644
index 6951e180eb8..00000000000
--- a/.github/workflows/test-docker-android.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Test Docker Android Image
-# This workflow is triggered on commits to main and pull requests.
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-permissions:
-  contents: read
-
-jobs:
-  test-docker-android:
-    name: Test Docker
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Free up space by removing unnecessary folders
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - name: Build Docker image with Android test app
-        run: npm run docker-build-android
diff --git a/scripts/circleci/buck_fetch.sh b/scripts/buck/buck_fetch.sh
similarity index 96%
rename from scripts/circleci/buck_fetch.sh
rename to scripts/buck/buck_fetch.sh
index 392ced89f9b..bca4ec9b29b 100755
--- a/scripts/circleci/buck_fetch.sh
+++ b/scripts/buck/buck_fetch.sh
@@ -44,7 +44,7 @@ function retry {
 
 CURRENT_DIR=$(pwd)
 export KOTLIN_HOME="$CURRENT_DIR/third-party/kotlin"
-retry 3 scripts/download-kotlin-compiler-with-buck.sh
+retry 3 scripts/buck/download-kotlin-compiler-with-buck.sh
 
 retry 3 buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
 retry 3 buck fetch ReactAndroid/src/main/java/com/facebook/react
diff --git a/scripts/download-kotlin-compiler-with-buck.sh b/scripts/buck/download-kotlin-compiler-with-buck.sh
similarity index 100%
rename from scripts/download-kotlin-compiler-with-buck.sh
rename to scripts/buck/download-kotlin-compiler-with-buck.sh