diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46b562d6..cf0217a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,7 +101,7 @@ jobs:
       - name: Init devnet
         run: |
           cd matic-cli
-          ./bin/express-cli --init
+          ./bin/express-cli --init aws
 
       - name: Start devnet
         run: |
diff --git a/src/express/commands/cleanup.js b/src/express/commands/cleanup.js
index aa5201f6..cfef99c5 100644
--- a/src/express/commands/cleanup.js
+++ b/src/express/commands/cleanup.js
@@ -65,15 +65,18 @@ export async function stopServices(doc) {
 
     if (hostToIndexMap.get(ip) < returnTotalBorNodes(doc)) {
       console.log('📍Stopping bor on machine ' + ip + ' ...')
-      command = 'sudo systemctl stop bor.service'
+      command =
+        'sudo systemctl stop bor.service || echo "bor not running on current machine..."'
       await runSshCommand(ip, command, maxRetries)
     } else {
       console.log('📍Stopping erigon on machine ' + ip + ' ...')
-      command = 'sudo systemctl stop erigon.service'
+      command =
+        'sudo systemctl stop erigon.service || echo "erigon not running on current machine..."'
       await runSshCommand(ip, command, maxRetries)
     }
     console.log('📍Stopping heimdall on machine ' + ip + '...')
-    command = 'sudo systemctl stop heimdalld.service'
+    command =
+      'sudo systemctl stop heimdalld.service || echo "heimdall not running on current machine..."'
     await runSshCommand(ip, command, maxRetries)
   })
 
diff --git a/src/express/commands/update.js b/src/express/commands/update.js
index c81a84dc..84f560e6 100644
--- a/src/express/commands/update.js
+++ b/src/express/commands/update.js
@@ -47,7 +47,8 @@ export async function pullAndRestartBor(ip, i, isPull) {
   }
 
   console.log('📍Starting bor...')
-  command = 'sudo systemctl start bor.service'
+  command =
+    'sudo systemctl start bor.service || echo "bor not configured on current machine..."'
   await runSshCommand(ip, command, maxRetries)
 }
 
@@ -94,7 +95,8 @@ export async function pullAndRestartErigon(ip, i, isPull, erigonHostsLength) {
   }
 
   console.log('📍Starting erigon...')
-  command = 'sudo systemctl start erigon.service'
+  command =
+    'sudo systemctl start erigon.service || echo "erigon not configured on current machine..."'
   await runSshCommand(ip, command, maxRetries)
 }
 
@@ -145,7 +147,8 @@ export async function pullAndRestartHeimdall(doc, ip, i, isPull) {
   }
 
   console.log('📍Starting heimdall...')
-  command = 'sudo systemctl start heimdalld.service'
+  command =
+    'sudo systemctl start heimdalld.service || echo "heimdall not configured on current machine..."'
   await runSshCommand(ip, command, maxRetries)
 }