diff --git a/tasks/main.yml b/tasks/main.yml
index 1dad493..3a5db8a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,8 +1,12 @@
 ---
 # tasks file for apigee-opdk-start-components
-
-- name: Start Apigee
+- name: Start Apigee component {{ component_name }}
   ignore_errors: yes
   shell: '{{ apigee_all }} start'
-  register: start_cmd_report
-  when: opdk_version | version_compare('4.16.01', '>=')
+  when: component_name == 'all' and opdk_version | version_compare('4.16.01', '>=')
+
+- name: Start Apigee component {{ component_name }}
+  ignore_errors: yes
+  shell: '{{ apigee_service }} {{ component_name }} start'
+  when: component_name != 'all' and opdk_version | version_compare('4.16.01', '>=')
+