diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
index 41dc3b4c75..f109b9f1f5 100644
--- a/.github/workflows/android_build.yml
+++ b/.github/workflows/android_build.yml
@@ -30,7 +30,7 @@ jobs:
             --config=remote-ci-macos \
             --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
             --fat_apk_cpu=x86_64 \
-            //:android_dist_ci
+            //:android_dist
   javahelloworld:
     name: java_helloworld
     runs-on: macos-12
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6a9938089f..0a5631df5d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
               --define=pom_version="${current_release_version:1}" \
               --config=remote-ci-macos \
               --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
-              //:android_dist_ci
+              //:android_dist
       - name: 'Tar artifacts'
         run: tar -czvf envoy_android_aar_sources.tar.gz bazel-bin/library/kotlin/io/envoyproxy/envoymobile/envoy.aar bazel-bin/library/kotlin/io/envoyproxy/envoymobile/envoy-pom.xml bazel-bin/library/kotlin/io/envoyproxy/envoymobile/envoy-sources.jar bazel-bin/library/kotlin/io/envoyproxy/envoymobile/envoy-javadoc.jar
       - uses: actions/upload-artifact@v2
diff --git a/BUILD b/BUILD
index 6d5d6f0fd3..4c02f13054 100644
--- a/BUILD
+++ b/BUILD
@@ -50,17 +50,8 @@ aar_import(
 )
 
 alias(
-    name = "android_dist_ci",
-    actual = "//library/kotlin/io/envoyproxy/envoymobile:envoy_aar_with_artifacts",
-)
-
-filegroup(
     name = "android_dist",
-    srcs = [
-        "//library/kotlin/io/envoyproxy/envoymobile:envoy_aar",
-        "//library/kotlin/io/envoyproxy/envoymobile:envoy_aar_objdump_collector",
-        "//library/kotlin/io/envoyproxy/envoymobile:envoy_aar_pom_xml",
-    ],
+    actual = "//library/kotlin/io/envoyproxy/envoymobile:envoy_aar_with_artifacts",
 )
 
 define_kt_toolchain(