diff --git a/Makefile b/Makefile
index 416d392..086386d 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ build-docker-version: check-docker-image-tag package
 	docker build --rm -t $(DOCKER_REPO):$(DOCKER_IMAGE_TAG) .
 
 test-docker: build-docker
-	docker run --rm --entrypoint "bash" $(DOCKER_TAG) ./dev/test.sh
+	docker run --rm --entrypoint "bash" $(DOCKER_IMAGE_TAG) ./dev/test.sh
 
 push-docker: check-docker-image-tag
-	docker push $(DOCKER_REPO):$(DOCKER_TAG_TAG)
+	docker push $(DOCKER_REPO):$(DOCKER_IMAGE_TAG)
 
 check-docker-image-tag:
 ifndef DOCKER_IMAGE_TAG
diff --git a/pom.xml b/pom.xml
index f14ebb9..59ce00a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>com.github.yuiskw</groupId>
   <artifactId>bigquery-to-datastore</artifactId>
-  <version>0.6.1</version>
+  <version>0.7.0</version>
 
   <packaging>jar</packaging>
 
diff --git a/src/main/java/com/github/yuiskw/beam/BigQuery2Datastore.java b/src/main/java/com/github/yuiskw/beam/BigQuery2Datastore.java
index a5b3203..d41bd33 100644
--- a/src/main/java/com/github/yuiskw/beam/BigQuery2Datastore.java
+++ b/src/main/java/com/github/yuiskw/beam/BigQuery2Datastore.java
@@ -89,7 +89,7 @@ public static void main(String[] args) {
         .apply(reader)
         .apply(ParDo.of(fn))
         .apply(writer);
-    pipeline.run();
+    pipeline.run().waitUntilFinish();
   }
 
   /**