diff --git a/roles/amq_streams_common/defaults/main.yml b/roles/amq_streams_common/defaults/main.yml
index 34b265b..cc17b1c 100644
--- a/roles/amq_streams_common/defaults/main.yml
+++ b/roles/amq_streams_common/defaults/main.yml
@@ -11,8 +11,8 @@ amq_streams_common_archive_file: "kafka_{{ amq_streams_common_version }}.tgz"
 amq_streams_common_rhn_product_archive_file_pattern: '^.*/amq-streams-[0-9.]*-bin.zip$'
 amq_streams_common_download_url: "https://archive.apache.org/dist/kafka/{{ amq_streams_common_product_version }}/kafka_{{ amq_streams_common_version }}.tgz"
 amq_streams_common_download_dir: "{{ lookup('env','PWD') | default('/opt') }}"
-amq_streams_common_download_user: "{{ lookup('env','USER') | default('root') }}"
-amq_streams_common_download_group: "{{ lookup('env','USER') | default('root') }}"
+#amq_streams_common_download_user: "{{ lookup('env','USER') | default('root') }}"
+#amq_streams_common_download_group: "{{ lookup('env','USER') | default('root') }}"
 amq_streams_common_install_dir: /opt
 amq_streams_common_offline_install: false
 amq_streams_common_path_to_archive_file: "{{ amq_streams_common_download_dir }}/{{ amq_streams_common_archive_file }}"
diff --git a/roles/amq_streams_common/tasks/download.yml b/roles/amq_streams_common/tasks/download.yml
index 5280963..9520922 100644
--- a/roles/amq_streams_common/tasks/download.yml
+++ b/roles/amq_streams_common/tasks/download.yml
@@ -48,6 +48,8 @@
   ansible.builtin.get_url:
     url: "{{ amq_streams_common.archive.download_url }}"
     dest: "{{ amq_streams_common_download_dir }}/{{ amq_streams_common_archive_file }}"
+    owner: "{{ amq_streams_common_download_user | default(omit) }}"
+    group: "{{ amq_streams_common_download_group | default(omit) }}"
     mode: 0644
   delegate_to: localhost
   become: "{{ amq_streams_common_download_become | default('no') }}"
diff --git a/roles/amq_streams_common/tasks/systemd.yml b/roles/amq_streams_common/tasks/systemd.yml
index 7e78f56..c2e62d0 100644
--- a/roles/amq_streams_common/tasks/systemd.yml
+++ b/roles/amq_streams_common/tasks/systemd.yml
@@ -58,13 +58,6 @@
   register: daemon_reload
   become: yes
 
-- name: "Wait for service port {{ server_port }} to be available - (if provided)"
-  ansible.builtin.wait_for:
-    host: "{{ server_port }}"
-    delay: "{{ delay_before_server_port_check | default(omit) }}"
-  when:
-    - server_port is defined and server_port != ''
-
 - name: "Perform daemon-reload to ensure the changes are picked up"
   ansible.builtin.systemd:
     daemon_reload: yes
@@ -79,3 +72,10 @@
     enabled: yes
     state: started
   become: yes
+
+- name: "Wait for service port {{ server_port }} to be available - (if provided)"
+  ansible.builtin.wait_for:
+    host: "{{ server_port }}"
+    delay: "{{ delay_before_server_port_check | default(omit) }}"
+  when:
+    - server_port is defined and server_port != ''