diff --git a/asterixdb/asterix-server/src/main/opt/ansible/bin/erase.sh b/asterixdb/asterix-server/src/main/opt/ansible/bin/erase.sh
index e7bf19d..c289996 100644
--- a/asterixdb/asterix-server/src/main/opt/ansible/bin/erase.sh
+++ b/asterixdb/asterix-server/src/main/opt/ansible/bin/erase.sh
@@ -26,6 +26,9 @@
 
 INVENTORY=$ANSB_PATH/conf/inventory
 
+# Stop the instance first.
+$ANSB_PATH/bin/stop.sh
+
 # Erase the installation binary on all nodes.
 # TODO(yingyi): erase all data/txn/log directories.
 export ANSIBLE_HOST_KEY_CHECKING=false
diff --git a/asterixdb/asterix-server/src/main/opt/ansible/yaml/instance_stop.yml b/asterixdb/asterix-server/src/main/opt/ansible/yaml/instance_stop.yml
index 7a942e9..d2fb7a3 100644
--- a/asterixdb/asterix-server/src/main/opt/ansible/yaml/instance_stop.yml
+++ b/asterixdb/asterix-server/src/main/opt/ansible/yaml/instance_stop.yml
@@ -20,14 +20,16 @@
 - hosts: all
   tasks:
     - name: Check CC and NC processes
-      shell: jps | egrep '(CDriver|NCService)' | awk '{print $1}'
+      shell: ps aux | awk '/[j]ava.*(CDriver|NCService)/'
       register: procs
+      failed_when: false
 
     - set_fact:
         lines: "{{ procs.stdout_lines|length }}"
 
     - name: Stop the CC and NCs
-      shell: kill `jps | egrep '(CDriver|NCService)' | awk '{print $1}'`
+      shell: kill `ps aux | awk '/[j]ava.*(CDriver|NCService)/ {print $2}'`
+      failed_when: false
       when: lines != "0"
 
     - name: Wait two seconds
@@ -35,12 +37,14 @@
       when: lines != "0"
 
     - name: Check leftover CC and NC processes
-      shell: jps | egrep '(CDriver|NCService)' | awk '{print $1}'
+      shell: ps aux | awk '/[j]ava.*(CDriver|NCService)/'
       register: procs
+      failed_when: false
 
     - set_fact:
         lines: "{{ procs.stdout_lines|length }}"
 
     - name: Force stopping leftover CC and NC processes
-      shell: kill -9 `jps | egrep '(CDriver|NCService)' | awk '{print $1}'`
+      shell: kill -9 `ps aux | awk '/[j]ava.*(CDriver|NCService)/ {print $2}'`
+      failed_when: false
       when: lines != "0"
diff --git a/asterixdb/asterix-server/src/main/opt/ansible/yaml/start_cc.yml b/asterixdb/asterix-server/src/main/opt/ansible/yaml/start_cc.yml
index 32b1579..bb170d8 100644
--- a/asterixdb/asterix-server/src/main/opt/ansible/yaml/start_cc.yml
+++ b/asterixdb/asterix-server/src/main/opt/ansible/yaml/start_cc.yml
@@ -20,13 +20,13 @@
 - name: Copy cluster config to CC
   synchronize:
     src: /tmp/asterixdb/cc.conf
-    dest: "{{ basedir }}/cc.conf"
+    dest: "{{ binarydir }}/cc.conf"
 
 - name: Update cluster config
-  shell: find -P "{{ basedir }}/cc.conf" | xargs perl -pi -e 's|command=asterixnc|command={{ ncbin }}|g'
+  shell: find -P "{{ binarydir }}/cc.conf" | xargs perl -pi -e 's|command=asterixnc|command={{ ncbin }}|g'
 
 - name: Start CC
-  shell: nohup "{{ cc }}" -config-file "{{ basedir }}/cc.conf" &> "{{ binarydir }}/logs/cc.log" &
+  shell: nohup "{{ cc }}" -config-file "{{ binarydir }}/cc.conf" &> "{{ binarydir }}/logs/cc.log" &
   args:
     chdir: "{{ binarydir }}"
   async: 10