diff --git a/3-tier/ap.yml b/3-tier/ap.yml
index 5c7eaf6..9e6a9fa 100644
--- a/3-tier/ap.yml
+++ b/3-tier/ap.yml
@@ -1,6 +1,5 @@
 # Copyright FUJITSU LIMITED 2015-2017.
 
-- include: ./common.yml
 - include: ./tasks/common/config_cron.yml
 - include: ./tasks/common/init_ebs_volume.yml
   vars:
diff --git a/3-tier/es.yml b/3-tier/es.yml
index 70a8750..bf82ea7 100644
--- a/3-tier/es.yml
+++ b/3-tier/es.yml
@@ -1,6 +1,5 @@
 # Copyright FUJITSU LIMITED 2015-2017.
 
-- include: ./common.yml
 - include: ./tasks/common/config_cron.yml
 
 - include: ./tasks/common/init_ebs_volume.yml
diff --git a/3-tier/init_personium.yml b/3-tier/init_personium.yml
index 9b142c8..1b14aa5 100644
--- a/3-tier/init_personium.yml
+++ b/3-tier/init_personium.yml
@@ -1,14 +1,19 @@
 # Copyright FUJITSU LIMITED 2015-2017.
 
-- hosts: tag_ServerType_bastion
-  connection: local
+- hosts: all
   become: yes
   vars_files:
     - ./group_vars/common.yml
-    - ./group_vars/bastion.yml
   tasks:
     - include: ./tasks/common/check_base_url.yml
     - include: ./common.yml
+
+- hosts: tag_ServerType_bastion
+  become: yes
+  vars_files:
+    - ./group_vars/bastion.yml
+  tasks:
+    - include: ./tasks/common/check_base_url.yml
     - include: ./bastion.yml
   handlers:
     - include: ./handlers/common/restart_iptables.yml
@@ -18,7 +23,6 @@
 - hosts: tag_ServerType_es
   become: yes
   vars_files:
-    - ./group_vars/common.yml
     - ./group_vars/es.yml
   tasks:
     - include: ./es.yml
@@ -30,7 +34,6 @@
 - hosts: tag_ServerType_nfs
   become: yes
   vars_files:
-    - ./group_vars/common.yml
     - ./group_vars/nfs.yml
   tasks:
     - include: ./nfs.yml
@@ -42,7 +45,6 @@
 - hosts: tag_ServerType_ap
   become: yes
   vars_files:
-    - ./group_vars/common.yml
     - ./group_vars/ap.yml
   tasks:
     - include: ./ap.yml
@@ -54,7 +56,6 @@
 - hosts: tag_ServerType_web
   become: yes
   vars_files:
-    - ./group_vars/common.yml
     - ./group_vars/web.yml
   tasks:
     - include: ./web.yml
@@ -65,10 +66,8 @@
     - web
 
 - hosts: tag_ServerType_bastion
-  connection: local
   become: yes
   vars_files:
-    - ./group_vars/common.yml
     - ./group_vars/bastion.yml
   tasks:
     - include: ./tasks/bastion/init_servicemanager.yml
diff --git a/3-tier/nfs.yml b/3-tier/nfs.yml
index da228e2..8addbdc 100644
--- a/3-tier/nfs.yml
+++ b/3-tier/nfs.yml
@@ -1,6 +1,5 @@
 # Copyright FUJITSU LIMITED 2015-2017.
 
-- include: ./common.yml
 - include: ./tasks/common/config_cron.yml
 
 - include: ./tasks/common/init_ebs_volume.yml
diff --git a/3-tier/static_inventory/hosts b/3-tier/static_inventory/hosts
index f9b64e1..eb40747 100644
--- a/3-tier/static_inventory/hosts
+++ b/3-tier/static_inventory/hosts
@@ -76,7 +76,7 @@ path_based_cell_url_enabled={Path_Based_Cell_Url_Enabled}
 
 ############ Setting items of bastion server ############
 [tag_ServerType_bastion:vars]
-
+ansible_connection=local
 
 
 ############ Setting items of Web server ############
diff --git a/3-tier/web.yml b/3-tier/web.yml
index 8c42129..09c1e83 100644
--- a/3-tier/web.yml
+++ b/3-tier/web.yml
@@ -1,6 +1,5 @@
 # Copyright FUJITSU LIMITED 2015.
 
-- include: ./common.yml
 - include: ./tasks/common/config_cron.yml
 
 - include: ./tasks/common/init_process_account_common.yml
diff --git a/all-in-one/init_personium.yml b/all-in-one/init_personium.yml
index 2667ff9..c19919c 100644
--- a/all-in-one/init_personium.yml
+++ b/all-in-one/init_personium.yml
@@ -1,47 +1,26 @@
 # Copyright FUJITSU LIMITED 2015-2017.
 
-- hosts: tag_ServerType_bastion
-  connection: local
-  become: yes
-  vars_files:
-    - ./group_vars/common.yml
-    - ./group_vars/bastion.yml
-  tasks:
-    - include: ./tasks/common/check_base_url.yml
-    - include: ./common.yml
-    - include: ./bastion.yml
-  handlers:
-    - include: ./handlers/common/restart_firewalld.yml
-  tags:
-    - bastion_pre
-
 - hosts: tag_ServerType_personium
   connection: local
   become: yes
   vars_files:
     - ./group_vars/common.yml
+    - ./group_vars/bastion.yml
     - ./group_vars/es.yml
     - ./group_vars/nfs.yml
     - ./group_vars/ap.yml
     - ./group_vars/web.yml
   tasks:
+    - include: ./tasks/common/check_base_url.yml
     - include: ./tasks/common/config_cron.yml
     - include: ./common.yml
+    - include: ./bastion.yml tags=bastion_pre
     - include: ./es.yml tags=es
     - include: ./nfs.yml tags=nfs
     - include: ./ap.yml tags=ap
     - include: ./web.yml tags=web
+    - include: ./tasks/bastion/init_servicemanager.yml tags=bastion_post
   handlers:
     - include: ./handlers/common/restart_firewalld.yml
     - include: ./handlers/web/reload_nginx.yml
 
-- hosts: tag_ServerType_bastion
-  connection: local
-  become: yes
-  vars_files:
-    - ./group_vars/common.yml
-    - ./group_vars/bastion.yml
-  tasks:
-    - include: ./tasks/bastion/init_servicemanager.yml
-  tags:
-    - bastion_post
diff --git a/all-in-one/static_inventory/hosts b/all-in-one/static_inventory/hosts
index 7419c8f..34e408e 100644
--- a/all-in-one/static_inventory/hosts
+++ b/all-in-one/static_inventory/hosts
@@ -1,8 +1,3 @@
-############ Private IP Address of Bastion server ############
-[tag_ServerType_bastion]
-#Fill in the Private IP Address of Bastion server
-127.0.0.1
-
 ############ Private IP Address of Personium server ############
 [tag_ServerType_personium]
 #Fill in the Private IP Address of Personium server