diff --git a/docker/Emulator_x86 b/docker/Emulator_x86
index 8b9c6fc..d838859 100644
--- a/docker/Emulator_x86
+++ b/docker/Emulator_x86
@@ -90,13 +90,15 @@ ARG SYS_IMG=x86
 ARG IMG_TYPE=google_apis
 ARG BROWSER=android
 ARG CHROME_DRIVER=2.40
+ARG GOOGLE_PLAY_SERVICE=12.8.74
 ENV ANDROID_VERSION=$ANDROID_VERSION \
     API_LEVEL=$API_LEVEL \
     PROCESSOR=$PROCESSOR \
     SYS_IMG=$SYS_IMG \
     IMG_TYPE=$IMG_TYPE \
     BROWSER=$BROWSER \
-    CHROME_DRIVER=$CHROME_DRIVER
+    CHROME_DRIVER=$CHROME_DRIVER \
+    GOOGLE_PLAY_SERVICE=$GOOGLE_PLAY_SERVICE
 ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
 
 RUN yes | sdkmanager --licenses && \
@@ -110,6 +112,11 @@ RUN wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/${CHROME
  && unzip -x chrome.zip \
  && rm chrome.zip
 
+#=================================================
+# Download Google Play Service APK from apklinker
+#=================================================
+Run wget -nv -O google_play_service.apk ""https://www.apklinker.com/wp-content/uploads/uploaded_apk/5b51570a214a8/com.google.android.gms_${GOOGLE_PLAY_SERVICE}-040700-204998136_12874026_MinAPI23_(x86)(nodpi)_apklinker.com.apk"
+
 #================================================
 # noVNC Default Configurations
 # These Configurations can be changed through -e
diff --git a/src/utils.sh b/src/utils.sh
old mode 100644
new mode 100755
index bd3392e..fa840a0
--- a/src/utils.sh
+++ b/src/utils.sh
@@ -1,30 +1,30 @@
 #!/bin/bash
-BOOT ()
-{
-  A=$(adb wait-for-device shell getprop sys.boot_completed | tr -d '\r')
-  while [[ $A != "1" ]]; do
-          sleep 1;
-          A=$(adb wait-for-device shell getprop sys.boot_completed | tr -d '\r')
-  done;
+
+function wait_emulator_to_be_ready () {
+  boot_completed=false
+  while [ "$boot_completed" == false ]; do
+    status=$(adb wait-for-device shell getprop sys.boot_completed | tr -d '\r')
+    echo "Boot Status: $boot_completed"
+
+    if [ "$boot_completed" == "1" ]; then
+      boot_completed=true
+    else
+      sleep 1
+    fi      
+  done
 }
 
-Get_Google_Play_Services ()
-{
-  wget "https://www.apklinker.com/wp-content/uploads/uploaded_apk/5b51570a214a8/com.google.android.gms_12.8.74-040700-204998136_12874026_MinAPI23_(x86)(nodpi)_apklinker.com.apk"
+function install_google_play_service () {
+  wait_emulator_to_be_ready
+  adb install -r "/root/google_play_service.apk"
 }
 
-Update_Google_Play_Services ()
-{
-  adb install -r "$PWD/com.google.android.gms_12.8.74-040700-204998136_12874026_MinAPI23_(x86)(nodpi)_apklinker.com.apk"
-}
-Disable_animations ()
-{
+function disable_animation () {
   # this is for demonstration what other amazing staff can be done here
   adb shell "settings put global window_animation_scale 0.0"
   adb shell "settings put global transition_animation_scale 0.0"
   adb shell "settings put global animator_duration_scale 0.0"
 }
-BOOT
-Get_Google_Play_Services
-Update_Google_Play_Services
-Disable_animations
+
+install_google_play_service
+disable_animation