diff --git a/agent/Dockerfile b/agent/Dockerfile
index ec33709fc..9cc80ad69 100644
--- a/agent/Dockerfile
+++ b/agent/Dockerfile
@@ -4,11 +4,13 @@
 # in project root DIR to generate the JAR_FILE (agent/build/libs/agent.jar).
 FROM mcr.microsoft.com/openjdk/jdk:11-ubuntu
 ARG JAR_FILE=build/libs/agent.jar
+ARG START_SCRIPT=start.sh
 
 ENV TZ="Asia/Shanghai" \
     TIME_ZONE="Asia/Shanghai" \
-    ANDROID_HOME=/opt/android-sdk-linux
-ENV PATH $PATH:${ANDROID_HOME}/tools:$ANDROID_HOME/platform-tools
+    ANDROID_HOME=/opt/android-sdk-linux \
+    ANDROID_SDK_ROOT=/opt/android-sdk-linux
+ENV PATH $PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/emulator:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin
 
 RUN \
     ln -sf /usr/share/zoneinfo/{TZ} /etc/localtime && \
@@ -19,9 +21,39 @@ RUN \
     apt-get install -y python3.8 && \
     apt-get install -y python3-pip && \
     mkdir -m 0750 /.android && \
-    mkdir /hydra && \
-    wget -qO- "http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz" | tar -zx -C /opt && \
-    echo y | android update sdk --no-ui --all --filter platform-tools --force
+    mkdir /hydra
+
+# set up environment for emulator, an example ref: https://andresand.medium.com/android-emulator-on-docker-container-f20c49b129ef
+# We attempt to start an Android emulator in the docker container so that when the agent is started, we will have a initial Android emulator phone available.
+RUN \
+    apt-get install -y unzip libnss3-dev libxcomposite-dev libxdamage1 && \
+    # apt-get install -y unzip libnss3-dev libxcomposite-dev libxdamage1 libfontconfig libglu1 libxcomposite1 libxcursor1 libpulse0 libasound2 && \
+    # Accepted values are: [add-on, doc, extra, platform, platform-tool, sample, source, system-image, tool]
+    mkdir -p /opt/android-sdk-linux/cmdline-tools && \
+    # https://developer.android.com/studio#command-tools
+    # https://developer.android.google.cn/studio/command-line#tools-sdk \
+    wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip && \
+    unzip commandlinetools-linux-9477386_latest.zip && \
+    # Either specify it explicitly with --sdk_root= or move this package into its expected location: <sdk>/cmdline-tools/latest/
+    mv cmdline-tools /opt/android-sdk-linux/cmdline-tools/latest
+
+RUN \
+    ls -al /opt/android-sdk-linux/cmdline-tools/latest && \
+    echo "y" | sdkmanager --install "platform-tools" "emulator" "platforms;android-27" && \
+    # Use "sdkmanager --list" to fetch available sdk id list, when command want to install a newer android sdk. \
+    # x86_64 needs hardward accelaration support; \
+    # arm can run on the android API of maximum 27: https://stackoverflow.com/questions/74760054/panic-avds-cpu-architecture-arm64-is-not-supported-by-the-qemu2-emulator-on; \
+    # TODO: Need an ARM PC for local debug, and the sample app should have a ARM version.
+#    echo "y" | sdkmanager --install "system-images;android-24;default;armeabi-v7a"
+    echo "y" | sdkmanager --install "system-images;android-27;default;arm64-v8a"
+
+RUN \
+     echo "y" | sdkmanager --licenses && \
+    # https://developer.android.com/studio/command-line/avdmanager
+    # Use "avdmanager list device" to fetch available device list value used in parameter "-d".
+#    echo "no" | avdmanager create avd -n emuTestPixel -k "system-images;android-24;default;armeabi-v7a" -d "pixel_4_xl" -f
+    echo "no" | avdmanager create avd -n emuTestPixel -k "system-images;android-27;default;arm64-v8a" -d "pixel_4_xl" -f
+    # echo y | sdkmanager "system-images;android-24;default;armeabi-v7a"  --sdk_root=/opt/android-sdk-linux  && \
 
 # TODO: after we enable the smart test in Github, we will reactivate the following layers.
 # Install python/pip and smart test dependencies
@@ -31,8 +63,9 @@ RUN \
 # RUN pip3 install -r /requirements.txt
 
 COPY ${JAR_FILE} /app.jar
+COPY ${START_SCRIPT} /start.sh
 
 # Official doc about connecting package with repo: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#labelling-container-images
 LABEL org.opencontainers.image.source=https://github.com/microsoft/HydraLab
 
-ENTRYPOINT ["java","-jar","/app.jar","--spring.profiles.active=docker"]
\ No newline at end of file
+ENTRYPOINT ["sh", "start.sh"]
\ No newline at end of file
diff --git a/agent/start.sh b/agent/start.sh
new file mode 100644
index 000000000..f03156f09
--- /dev/null
+++ b/agent/start.sh
@@ -0,0 +1,7 @@
+adb kill-server
+adb start-server
+# start emulator
+# The binary emulator-headless is now retired. Headless builds of the engine are now launched via emulator -no-window, thus unifying the previously separate (but similar) paths.
+nohup emulator -avd emuTestPixel -noaudio -no-boot-anim -gpu off -no-window -qemu -machine virt &
+
+java -jar /app.jar --spring.profiles.active=docker
\ No newline at end of file