diff --git a/templates/Makefile b/templates/Makefile
index 57233fd..4504e9a 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -24,7 +24,7 @@ build:
 		-t $(LATEST_TAG) $(ROOT_DIR)
 
 snapshot:
-	bash $(ROOT_DIR)/take_snapshot.sh
+	bash $(ROOT_DIR)/take_snapshot.sh $(LATEST_TAG) $(SNAPSHOT_LATEST_TAG)
 
 lint:
 	docker run -it --rm -v "$(ROOT_DIR)/Dockerfile:/Dockerfile:ro" redcoolbeans/dockerlint
diff --git a/templates/take_snapshot.sh b/templates/take_snapshot.sh
index 1cff5e2..65ed9d6 100644
--- a/templates/take_snapshot.sh
+++ b/templates/take_snapshot.sh
@@ -2,13 +2,16 @@
 
 set -ex
 
+image_name=$1
+snapshot_image_name=$2
+
 docker rm -f emulator || true
 
-docker run -d -t --name emulator --rm --privileged -v /dev/kvm:/dev/kvm -e ANDROID_ARCH="x86" agoda/docker-emulator-{{ platform }} bash
+docker run -d -t --name emulator --rm --privileged -v /dev/kvm:/dev/kvm -e ANDROID_ARCH="x86" $image_name bash
 
 docker cp snapshot.sh emulator:/snapshot.sh
 docker cp snapshot.expect emulator:/snapshot.expect
 docker exec -t emulator bash -c "bash /snapshot.sh; exit"
 echo "Creating new image"
-docker commit -m "Snapshot!" --change "CMD [\"/start.sh\"]" emulator agoda/docker-emulator-snapshot-{{ platform }}
+docker commit -m "Snapshot!" --change "CMD [\"/start.sh\"]" emulator $snapshot_image_name
 docker rm -f emulator