diff --git a/tasks/install-bootstrap-with-proxy.yml b/tasks/install-bootstrap.yml
similarity index 84%
rename from tasks/install-bootstrap-with-proxy.yml
rename to tasks/install-bootstrap.yml
index 33a5943..63eb077 100644
--- a/tasks/install-bootstrap-with-proxy.yml
+++ b/tasks/install-bootstrap.yml
@@ -1,7 +1,7 @@
 ---
 - block:
   - name: Update apigee-service if upgrade_edge is set as part of an upgrade with proxy
-    shell: "bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword='{{ apigee_repo_password }}' JAVA_FIX=C"
+    command: "{{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword='{{ apigee_repo_password }}' JAVA_FIX=C"
     env:
       JAVA_HOME: '{{ java_home }}'
     when: upgrade_edge is defined and upgrade_edge | bool == True and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
@@ -23,7 +23,7 @@
 
 - block:
   - name: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with proxy
-    shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+    command: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
     args:
       creates: '{{ apigee_home }}/apigee-service/bin/apigee-service'
     env:
@@ -53,7 +53,7 @@
 
 - block:
   - name: Install bootstrap from development repositories with proxy
-    shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+    command: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
     args:
       creates: '{{ apigee_home }}/apigee-service/bin/apigee-service'
     env:
diff --git a/tasks/install-online.yml b/tasks/install-online.yml
index d2511f3..e3247aa 100644
--- a/tasks/install-online.yml
+++ b/tasks/install-online.yml
@@ -40,11 +40,11 @@
   shell: "yum clean all"
 
 - block:
-  - include_tasks: install-bootstrap-with-proxy.yml
+  - include_tasks: install-bootstrap.yml
 
   rescue:
     - name: Yum failed to update, let's clean yum
-      shell: 'yum clean all'
+      command: 'yum clean all'
 
-    - include_tasks: install-bootstrap-with-proxy.yml
+    - include_tasks: install-bootstrap.yml
   become: yes
diff --git a/tasks/main.yml b/tasks/main.yml
index 6562fe6..70367ce 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -28,4 +28,13 @@
     msg: "Failing the playbook because apigee-service should be installed now and it was not installed"
   when: not apigee_service.stat.exists
 
+- name: Install Apigee component with proxy - {{ component }}
+  command: '{{ apigee_service }} {{ component }} install'
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"
+    PORT_TIMEOUT: '{{ port_timeout | default(60) }}'
+    UP_TIMEOUT: '{{ up_timeout | default(60) }}'
+  when: opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'