diff --git a/Analytics.md b/Analytics.md
index e610650..ec07227 100644
--- a/Analytics.md
+++ b/Analytics.md
@@ -9,7 +9,7 @@ Docker-Android's analytics record some shared information for every event:
 
 - The Google Analytics version i.e. `1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#v)
 - The Google Analytics anonymous IP setting is enabled i.e. `1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#aip)
-- The Docker-Android analytics tracking ID e.g. `UA-128205228-1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#tid)
+- The Docker-Android analytics tracking ID e.g. `UA-133466903-1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#tid)
 - The release version of machine, e.g. `Linux_version_4.4.16-boot2docker_(gcc_version_4.9.2_(Debian_4.9.2-10)_)_#1_SMP_Fri_Jul_29_00:13:24_UTC_2016` This does not allow us to track individual users but does enable us to accurately measure user counts vs. event counts (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#cid)
 - Docker-Android analytics hit type, e.g. `event` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#t)
 - Application type, e.g. `Emulator` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#ec)
diff --git a/LICENSE.md b/LICENSE.md
index b471d56..2bd77f1 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -12,7 +12,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 
 ## Forks
-Additionally to Apache-2.0, when you fork this repo you are required to either remove our Google Analytics tracking ID: UA-128205228-1 or stop usage gathering completely.
+Additionally to Apache-2.0, when you fork this repo you are required to either remove our Google Analytics tracking ID: UA-133466903-1 or stop usage gathering completely.
 
 ## Data processing agreement
 By using this software you agree that the following non-PII (non personally identifiable information) data will be collected, processed and used by the maintainers for the purpose of improving the docker-android project. Anonymisation with respect of the IP address means that only the first two octets of the IP address are collected.
diff --git a/MAINTAINERS b/MAINTAINERS
index 02cfc4b..5725d66 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1 +1 @@
-Budi Utomo <budi.ut.1989@gmail.com>
+Budi Utomo <budtmo.os@gmail.com>
diff --git a/README.md b/README.md
index 51ecda4..84bebf0 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,10 @@
   <img id="header" src="./images/logo_dockerandroid_small.png" />
 </p>
 
-[![Analytics](https://ga-beacon.appspot.com/UA-128205228-1/github/butomo1989/docker-android/README.md)](https://github.com/igrigorik/ga-beacon "Analytics")
+[![Analytics](https://ga-beacon.appspot.com/UA-133466903-1/github/budtmo/docker-android/README.md)](https://github.com/igrigorik/ga-beacon "Analytics")
 [![Join the chat at https://gitter.im/butomo1989/docker-android](https://badges.gitter.im/butomo1989/docker-android.svg)](https://gitter.im/butomo1989/docker-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/butomo1989/docker-android.svg?branch=master)](https://travis-ci.org/butomo1989/docker-android)
-[![codecov](https://codecov.io/gh/butomo1989/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/butomo1989/docker-android)
+[![Build Status](https://travis-ci.org/budtmo/docker-android.svg?branch=master)](https://travis-ci.org/budtmo/docker-android)
+[![codecov](https://codecov.io/gh/budtmo/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/budtmo/docker-android)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3f000ffb97db45a59161814e1434c429)](https://www.codacy.com/app/butomo1989/docker-appium?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=butomo1989/docker-appium&amp;utm_campaign=Badge_Grade)
 
 Docker-Android is a docker image built to be used for everything related to mobile website testing and Android project.
@@ -40,16 +40,16 @@ List of Docker images
 
 |OS   |Android   |API   |Browser   |Browser version   |Chromedriver   |Image   |Size   |
 |:---|:---|:---|:---|:---|:---|:---|:---|
-|Linux|5.0.1|21|browser|37.0|2.21|butomo1989/docker-android-x86-5.0.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-5.0.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-5.0.1 "Get your own image badge on microbadger.com")|
-|Linux|5.1.1|22|browser|39.0|2.13|butomo1989/docker-android-x86-5.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-5.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-5.1.1 "Get your own image badge on microbadger.com")|
-|Linux|6.0|23|browser|44.0|2.18|butomo1989/docker-android-x86-6.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-6.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-6.0 "Get your own image badge on microbadger.com")|
-|Linux|7.0|24|chrome|51.0|2.23|butomo1989/docker-android-x86-7.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-7.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-7.0 "Get your own image badge on microbadger.com")|
-|Linux|7.1.1|25|chrome|55.0|2.28|butomo1989/docker-android-x86-7.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-7.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-7.1.1 "Get your own image badge on microbadger.com")|
-|Linux|8.0|26|chrome|58.0|2.31|butomo1989/docker-android-x86-8.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-8.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-8.0 "Get your own image badge on microbadger.com")|
-|Linux|8.1|27|chrome|61.0|2.33|butomo1989/docker-android-x86-8.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-8.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-8.1 "Get your own image badge on microbadger.com")|
-|Linux|9.0|28|chrome|66.0|2.40|butomo1989/docker-android-x86-9.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-9.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-9.0 "Get your own image badge on microbadger.com")|
-|All |-|-|-|-|-|butomo1989/docker-android-real-device|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-real-device.svg)](https://microbadger.com/images/butomo1989/docker-android-real-device "Get your own image badge on microbadger.com")|
-|Linux|All|All|All|All|All|butomo1989/docker-android-genymotion|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-genymotion.svg)](https://microbadger.com/images/butomo1989/docker-android-genymotion "Get your own image badge on microbadger.com")|
+|Linux|5.0.1|21|browser|37.0|2.21|budtmo/docker-android-x86-5.0.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-5.0.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-5.0.1 "Get your own image badge on microbadger.com")|
+|Linux|5.1.1|22|browser|39.0|2.13|budtmo/docker-android-x86-5.1.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-5.1.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-5.1.1 "Get your own image badge on microbadger.com")|
+|Linux|6.0|23|browser|44.0|2.18|budtmo/docker-android-x86-6.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-6.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-6.0 "Get your own image badge on microbadger.com")|
+|Linux|7.0|24|chrome|51.0|2.23|budtmo/docker-android-x86-7.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-7.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-7.0 "Get your own image badge on microbadger.com")|
+|Linux|7.1.1|25|chrome|55.0|2.28|budtmo/docker-android-x86-7.1.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-7.1.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-7.1.1 "Get your own image badge on microbadger.com")|
+|Linux|8.0|26|chrome|58.0|2.31|budtmo/docker-android-x86-8.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-8.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-8.0 "Get your own image badge on microbadger.com")|
+|Linux|8.1|27|chrome|61.0|2.33|budtmo/docker-android-x86-8.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-8.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-8.1 "Get your own image badge on microbadger.com")|
+|Linux|9.0|28|chrome|66.0|2.40|budtmo/docker-android-x86-9.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-9.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-9.0 "Get your own image badge on microbadger.com")|
+|All |-|-|-|-|-|budtmo/docker-android-real-device|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-real-device.svg)](https://microbadger.com/images/budtmo/docker-android-real-device "Get your own image badge on microbadger.com")|
+|Linux|All|All|All|All|All|budtmo/docker-android-genymotion|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-genymotion.svg)](https://microbadger.com/images/budtmo/docker-android-genymotion "Get your own image badge on microbadger.com")|
 
 List of Devices
 ---------------
@@ -76,7 +76,7 @@ Quick Start
 	- For ***Linux OS***, please use image name that contains "x86"
 
 		```bash
-		docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container butomo1989/docker-android-x86-8.1
+		docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container budtmo/docker-android-x86-8.1
 		```
 
 	- For ***OSX*** and ***Windows OS***, please use Virtual Machine that support Virtualization with Ubuntu OS
@@ -113,7 +113,7 @@ Docker-Android can be used for building Android project and executing its unit t
 2. Build the project
 
     ```bash
-    docker run -it --rm -v $PWD/android-testing/ui/espresso/BasicSample:/root/tmp butomo1989/docker-android-x86-8.1 tmp/gradlew build
+    docker run -it --rm -v $PWD/android-testing/ui/espresso/BasicSample:/root/tmp budtmo/docker-android-x86-8.1 tmp/gradlew build
     ```
     
 Control Android connected to host (Emulator or Real Device)
@@ -121,7 +121,7 @@ Control Android connected to host (Emulator or Real Device)
 1. Create a docker container with this command 
 
 	```
-	$ docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 --name android-container-appium butomo1989/docker-android-real-device
+	$ docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 --name android-container-appium budtmo/docker-android-real-device
 	```
 	
 2. Open noVNC [http://localhost:6080](http://localhost:6080)
diff --git a/README_APPIUM_AND_SELENIUM.md b/README_APPIUM_AND_SELENIUM.md
index 713b8e4..a7678a0 100644
--- a/README_APPIUM_AND_SELENIUM.md
+++ b/README_APPIUM_AND_SELENIUM.md
@@ -4,7 +4,7 @@ Run Appium Server
 Appium is automation test framework to test mobile website and mobile application, including Android. To be able to use Appium, you need to run appium-server. You run Appium-Server inside docker-android container by ***opening port 4723*** and ***passing an environment variable APPIUM=true***.
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true --name android-container budtmo/docker-android-x86-8.1
 ```
 
 ### Share Volume
@@ -12,7 +12,7 @@ docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 -
 If you want to use appium to test UI of your android application, you need to share volume where the APK is located to folder ***/root/tmp***.
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v $PWD/example/sample_apk:/root/tmp -e DEVICE="Nexus 5" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v $PWD/example/sample_apk:/root/tmp -e DEVICE="Nexus 5" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 --name android-container budtmo/docker-android-x86-8.1
 ```
 
 ### Connect to Selenium Grid
@@ -30,7 +30,7 @@ To run tests for mobile browser, following parameter can be passed:
 - MOBILE\_WEB\_TEST=true
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 -e MOBILE_WEB_TEST=true --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 -e MOBILE_WEB_TEST=true --name android-container budtmo/docker-android-x86-8.1
 ```
 
 ### Video Recording
diff --git a/README_CLOUD.md b/README_CLOUD.md
index 16766d9..c37edb5 100644
--- a/README_CLOUD.md
+++ b/README_CLOUD.md
@@ -19,7 +19,7 @@ the emulator can be brought up as follows:
 
     # Assume app.apk is in /tmp
     docker run --privileged -d -e DEVICE="Samsung Galaxy S6" --volume /tmp:/APK \
-         --name android_em butomo1989/docker-android-x86-8.1
+         --name android_em budtmo/docker-android-x86-8.1
 
     docker exec android_em adb wait-for-device 
     docker exec android_em adb install /APK/app.apk
diff --git a/README_CUSTOM_CONFIG.md b/README_CUSTOM_CONFIG.md
index 76e3020..3699eb6 100644
--- a/README_CUSTOM_CONFIG.md
+++ b/README_CUSTOM_CONFIG.md
@@ -28,7 +28,7 @@ Custom Emulator Arguments
 If you want to add more arguments for running emulator, you can ***pass an environment variable EMULATOR_ARGS*** while running docker command.
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e EMULATOR_ARGS="-no-snapshot-load -partition-size 512" --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e EMULATOR_ARGS="-no-snapshot-load -partition-size 512" --name android-container budtmo/docker-android-x86-8.1
 ```
 
 Back & Restore
@@ -40,7 +40,7 @@ If you want to backup/reuse the avds created with furture upgrades or for replic
 - -v local_backup/android_emulator:/root/android_emulator
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v local_backup/.android:/root/.android -v local_backup/android_emulator:local_backup/android_emulator -e DEVICE="Nexus 5" --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v local_backup/.android:/root/.android -v local_backup/android_emulator:local_backup/android_emulator -e DEVICE="Nexus 5" --name android-container budtmo/docker-android-x86-8.1
 ```
 
 For the first run, this will create a new avd and all the changes will be accessible in the `local_backup` directory. Now for all future runs, it will reuse the avds. Even this should work with new releases of `docker-android`
diff --git a/README_GENYMOTION.md b/README_GENYMOTION.md
index 5101ec7..11e1299 100644
--- a/README_GENYMOTION.md
+++ b/README_GENYMOTION.md
@@ -13,7 +13,7 @@ You can easily scale your Appium tests on Genymotion Android virtual devices in
 	export PASS="xxx"
 	export LICENSE="xxx"
 
-	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -e TYPE=SaaS -e USER=$USER -e PASS=$PASS -e LICENSE=$LICENSE butomo1989/docker-android-genymotion
+	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -e TYPE=SaaS -e USER=$USER -e PASS=$PASS -e LICENSE=$LICENSE budtmo/docker-android-genymotion
 	```
 
 <p align="center">
@@ -24,7 +24,7 @@ You can easily scale your Appium tests on Genymotion Android virtual devices in
 	Use [aws.json](genymotion/example/sample_devices/aws.json) to define configuration of EC2 instance and run following command:
 
 	```bash
-	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -v ~/.aws:/root/.aws -e TYPE=aws butomo1989/docker-android-genymotion
+	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -v ~/.aws:/root/.aws -e TYPE=aws budtmo/docker-android-genymotion
 	```
 
 You can also use [this docker-compose file](genymotion/example/geny.yml). 
diff --git a/README_VMWARE.md b/README_VMWARE.md
index fece74e..9a30623 100644
--- a/README_VMWARE.md
+++ b/README_VMWARE.md
@@ -65,7 +65,7 @@ The following instructions are used for OS X. You'll need [docker-machine-parall
 5. You may now run a docker container
     5.1. Let's run a docker image for an emulator with x86 processor.
     ```bash
-    docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container butomo1989/docker-android-x86-8.1
+    docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container budtmo/docker-android-x86-8.1
     ```
 
     When the services inside this docker container are running, connect to http://10.211.55.3:6080/vnc.html (the IP we got when the docker machine was created) and login. The emulator with x86 processor should be running on screen.
diff --git a/docker-compose.yml b/docker-compose.yml
index bf65b85..8cce1fb 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,10 +10,10 @@ services:
     ports:
       - 4444:4444
 
-  # There is a bug for using appium. Issue: https://github.com/butomo1989/docker-android/issues/73
+  # There is a bug for using appium. Issue: https://github.com/budtmo/docker-android/issues/73
   # Real devices
   #real_device:
-  #  image: butomo1989/docker-android-real-device
+  #  image: budtmo/docker-android-real-device
   #  privileged: true
   #  depends_on:
   #    - selenium_hub
@@ -49,7 +49,7 @@ services:
 
   # Docker-Android for Android application testing
   nexus_7.1.1:
-    image: butomo1989/docker-android-x86-7.1.1
+    image: budtmo/docker-android-x86-7.1.1
     privileged: true
     # Increase scale number if needed
     scale: 1
@@ -72,7 +72,7 @@ services:
   # Docker-Android for mobile website testing with chrome browser
   # Chrome browser exists only for version 7.0 and 7.1.1
   samsung_galaxy_web_7.1.1:
-    image: butomo1989/docker-android-x86-8.1
+    image: budtmo/docker-android-x86-8.1
     privileged: true
     # Increase scale number if needed
     scale: 1
@@ -94,7 +94,7 @@ services:
   # Docker-Android for mobile website testing with default browser
   # Default browser exists only for version 5.0.1, 5.1.1 and 6.0
   samsung_galaxy_web_5.1.1:
-    image: butomo1989/docker-android-x86-5.1.1
+    image: budtmo/docker-android-x86-5.1.1
     privileged: true
     # Increase scale number if needed
     scale: 1
diff --git a/docker.tf b/docker.tf
index aaa0143..582e52e 100644
--- a/docker.tf
+++ b/docker.tf
@@ -7,7 +7,7 @@ resource "docker_image" "selenium_hub_img" {
 }
 
 resource "docker_image" "docker_android_img" {
-	name 	= "butomo1989/docker-android-x86-8.1:latest"
+	name 	= "budtmo/docker-android-x86-8.1:latest"
 }
 
 resource "docker_network" "private_network" {
diff --git a/docker/Emulator_x86 b/docker/Emulator_x86
index 67e8abb..8ce7e0c 100644
--- a/docker/Emulator_x86
+++ b/docker/Emulator_x86
@@ -104,7 +104,7 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \
     GOOGLE_PLAY_STORE=$GOOGLE_PLAY_STORE \
     GA=true \
     GA_ENDPOINT=https://www.google-analytics.com/collect \
-    GA_TRACKING_ID=UA-128205228-1 \
+    GA_TRACKING_ID=UA-133466903-1 \
     GA_API_VERSION="1" \
     APP_RELEASE_VERSION=$APP_RELEASE_VERSION \
     APP_TYPE=Emulator
diff --git a/docker/Genymotion b/docker/Genymotion
index a08d1a1..fe20a10 100644
--- a/docker/Genymotion
+++ b/docker/Genymotion
@@ -93,7 +93,7 @@ ENV DISPLAY=:0 \
     LOG_PATH=/var/log/supervisor \
     GA=true \
     GA_ENDPOINT=https://www.google-analytics.com/collect \
-    GA_TRACKING_ID=UA-128205228-1 \
+    GA_TRACKING_ID=UA-133466903-1 \
     GA_API_VERSION="1" \
     APP_RELEASE_VERSION=$APP_RELEASE_VERSION \
     APP_TYPE=Genymotion
diff --git a/docker/Real_device b/docker/Real_device
index 6b7dca9..132a057 100644
--- a/docker/Real_device
+++ b/docker/Real_device
@@ -84,7 +84,7 @@ ENV DISPLAY=:0 \
     LOG_PATH=/var/log/supervisor \
     GA=true \
     GA_ENDPOINT=https://www.google-analytics.com/collect \
-    GA_TRACKING_ID=UA-128205228-1 \
+    GA_TRACKING_ID=UA-133466903-1 \
     GA_API_VERSION="1" \
     APP_RELEASE_VERSION=$APP_RELEASE_VERSION \
     APP_TYPE=Device
diff --git a/release.sh b/release.sh
index 841202a..80fa034 100755
--- a/release.sh
+++ b/release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Bash version should >= 4 to be able to run this script.
 
-IMAGE="butomo1989/docker-android"
+IMAGE="budtmo/docker-android"
 
 if [ -z "$1" ]; then
     read -p "Task (test|build|push|all) : " TASK
diff --git a/release_geny.sh b/release_geny.sh
index 5efdef7..68de7a7 100755
--- a/release_geny.sh
+++ b/release_geny.sh
@@ -12,7 +12,7 @@ else
     RELEASE=$2
 fi
 
-IMAGE="butomo1989/docker-android"
+IMAGE="budtmo/docker-android"
 FILE_NAME=docker/Genymotion
 
 image_version="$IMAGE-genymotion:$RELEASE"
diff --git a/release_real.sh b/release_real.sh
index ed8f3af..9f05799 100755
--- a/release_real.sh
+++ b/release_real.sh
@@ -12,7 +12,7 @@ else
     RELEASE=$2
 fi
 
-IMAGE="butomo1989/docker-android"
+IMAGE="budtmo/docker-android"
 FILE_NAME=docker/Real_device
 
 image_version="$IMAGE-real-device:$RELEASE"
diff --git a/revert.sh b/revert.sh
index 98b629c..9da3030 100644
--- a/revert.sh
+++ b/revert.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE_NAME="butomo1989/docker-android"
+IMAGE_NAME="budtmo/docker-android"
 
 if [ -z "$1" ]; then
     read -p "Type : " TYPE