diff --git a/CHANGELOG.md b/CHANGELOG.md
index a48c458a..41defc73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.1 (Unreleased)
+
+BUG FIXES:
+
+Role was failing at license and repo removal step when using the default of `nginx_app_protect_remove_license: true`.
+
 ## 0.6.0 (July 13, 2021)
 
 BREAKING CHANGES:
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index 2151d79d..2e82437c 100644
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -27,7 +27,6 @@
         nginx_enable: true
         nginx_start: true
         nginx_type: plus
-        nginx_remove_license: false
         nginx_license:
           certificate: ../../files/license/nginx-repo.crt
           key: ../../files/license/nginx-repo.key
diff --git a/tasks/common/install/remove-license.yml b/tasks/common/install/remove-license.yml
index 603aa578..a69219dc 100644
--- a/tasks/common/install/remove-license.yml
+++ b/tasks/common/install/remove-license.yml
@@ -3,8 +3,13 @@
   set_fact:
     nginx_app_protect_license_status: absent
 
-- name: Delete repository data
-  include_tasks: "{{ role_path }}/tasks/install/install-{{ ansible_os_family | lower }}.yml"
+- name: Delete NGINX App Protect WAF repository data
+  include_tasks: "{{ role_path }}/tasks/waf/install/install-{{ ansible_os_family | lower }}.yml"
+  when: nginx_app_protect_waf_enable | bool
+
+- name: Delete NGINX App Protect DoS repository data
+  include_tasks: "{{ role_path }}/tasks/dos/install/install-{{ ansible_os_family | lower }}.yml"
+  when: nginx_app_protect_dos_enable | bool
 
 - name: Delete NGINX App Protect license
   file: