diff --git a/docker/Emulator_arm b/docker/Emulator_arm
index a380da3..58e05a6 100644
--- a/docker/Emulator_arm
+++ b/docker/Emulator_arm
@@ -82,6 +82,10 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \
 ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
 RUN sdkmanager "platforms;android-${API_LEVEL}"
 RUN sdkmanager "system-images;android-${API_LEVEL};${IMG_TYPE};${SYS_IMG}"
+RUN sdkmanager "emulator"
+RUN rm ${ANDROID_HOME}/tools/emulator \
+ && ln -s ${ANDROID_HOME}/emulator/emulator64-${PROCESSOR} ${ANDROID_HOME}/tools/emulator
+ENV LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt/lib
 
 #==============================================
 #       Download chrome driver v2.26
diff --git a/docker/Emulator_x86 b/docker/Emulator_x86
index 476ba38..7460f83 100644
--- a/docker/Emulator_x86
+++ b/docker/Emulator_x86
@@ -95,6 +95,11 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \
 ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
 RUN sdkmanager "platforms;android-${API_LEVEL}"
 RUN sdkmanager "system-images;android-${API_LEVEL};${IMG_TYPE};${SYS_IMG}"
+RUN sdkmanager "emulator"
+RUN rm ${ANDROID_HOME}/tools/emulator \
+ && ln -s ${ANDROID_HOME}/emulator/emulator64-${PROCESSOR} ${ANDROID_HOME}/tools/emulator
+ENV LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt/lib
+
 
 #==============================================
 #       Download chrome driver v2.26
diff --git a/release.sh b/release.sh
index f883f6a..220af9b 100755
--- a/release.sh
+++ b/release.sh
@@ -163,7 +163,7 @@ function build() {
         for v in "${versions[@]}"; do
             # Find image type and default web browser
             if [ "$v" == "5.0.1" ] || [ "$v" == "5.1.1" ]; then
-                IMG_TYPE=android
+                IMG_TYPE=default
                 BROWSER=browser
             elif [ "$v" == "6.0" ]; then
                 # It is because there is no ARM EABI v7a System Image for 6.0