diff --git a/Makefile b/Makefile
index f6e8ec9fc3..cfaca6db92 100644
--- a/Makefile
+++ b/Makefile
@@ -437,7 +437,7 @@ android-clean: ##@prepare Clean Gradle state
 android-ports: export FLOWSTORM_PORT := 7722
 android-ports: export TARGET := android-sdk
 android-ports: ##@other Add proxies to Android Device/Simulator
-	adb reverse tcp:8081 tcp:8081 && \
+	adb reverse tcp:$(RCT_METRO_PORT) tcp:$(RCT_METRO_PORT) && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
 	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \
diff --git a/scripts/wait-for-metro-port.sh b/scripts/wait-for-metro-port.sh
index 67144cfe5a..c50d82ad3e 100755
--- a/scripts/wait-for-metro-port.sh
+++ b/scripts/wait-for-metro-port.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 TIMEOUT=10 # Metro should not take this long to start.
 
 while [ "${TIMEOUT}" -gt 0 ]; do
-  if ! lsof -i:8081 &> /dev/null; then
+  if ! lsof -i:RCT_METRO_PORT &> /dev/null; then
     echo "."
     sleep 1
     ((TIMEOUT--))