diff --git a/tasks/amplify/install-amplify.yml b/tasks/amplify/install-amplify.yml
index 16c0a30..9204abf 100644
--- a/tasks/amplify/install-amplify.yml
+++ b/tasks/amplify/install-amplify.yml
@@ -13,12 +13,12 @@
 - name: "(Setup: All OSs) Copy NGINX Configurator Agent Configuration Template"
   copy:
     remote_src: yes
-    src: /etc/amplify-agent/agent.configurator.conf.default
-    dest: /etc/amplify-agent/agent.configurator.conf
+    src: /etc/amplify-agent/agent.conf.default
+    dest: /etc/amplify-agent/agent.conf
 
 - name: "(Setup: All OSs) Configure NGINX Amplify Agent API Key"
   lineinfile:
     dest: /etc/amplify-agent/agent.conf
     regexp: api_key =.*
-    line: "api_key = {{ amplify_api_key }}"
+    line: "api_key = {{ nginx_amplify_api_key }}"
   notify: "(Handler: All OSs) Start NGINX Amplify Agent"
diff --git a/tasks/main.yml b/tasks/main.yml
index 436a8ba..a5d6ef8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -58,7 +58,7 @@
   when:
     - nginx_amplify_enable
     - nginx_amplify_api_key is defined
-    - nginx_amplify_api_key
+    - nginx_amplify_api_key | length > 0
 
 - import_tasks: controller/install-controller.yml
   when: