diff --git a/tasks/main.yml b/tasks/main.yml
index a85c2ed..7697d13 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -14,26 +14,8 @@
     - import_tasks: plus/install-plus.yml
       when: type == "plus"
 
-    - import_tasks: modules/install-njs.yml
-      when: modules.njs
-
-    - import_tasks: modules/install-perl.yml
-      when: modules.perl
-
-    - import_tasks: modules/install-geoip.yml
-      when: modules.geoip
-
-    - import_tasks: modules/install-image-filter.yml
-      when: modules.image_filter
-
-    - import_tasks: modules/install-rtmp.yml
-      when: modules.rtmp
-
-    - import_tasks: modules/install-xslt.yml
-      when: modules.xslt
-
-    - import_tasks: modules/install-waf.yml
-      when: modules.waf and type == "plus"
+    - import_tasks: modules/install-modules.yml
+      when: true in modules.values()
 
     - import_tasks: conf/push-config.yml
       when: main_push_enable or http_push_enable or stream_push_enable
diff --git a/tasks/modules/install-geoip.yml b/tasks/modules/install-geoip.yml
index 387c77c..3dd08f3 100644
--- a/tasks/modules/install-geoip.yml
+++ b/tasks/modules/install-geoip.yml
@@ -1,13 +1,13 @@
 ---
 - name: "(Install: All OSs) Install NGINX Open Source GeoIP Module"
   package:
-    name: nginx-geoip-perl
+    name: nginx-module-geoip
     state: present
   when: type == "opensource"
 
 - name: "(Install: All OSs) Install NGINX Plus GeoIP Module"
   package:
-    name: nginx-plus-geoip-perl
+    name: nginx-plus-module-geoip
     state: present
   when: type == "plus"
 
diff --git a/tasks/modules/install-modules.yml b/tasks/modules/install-modules.yml
new file mode 100644
index 0000000..52ae7c0
--- /dev/null
+++ b/tasks/modules/install-modules.yml
@@ -0,0 +1,21 @@
+---
+- import_tasks: install-njs.yml
+  when: modules.njs | default(false)
+
+- import_tasks: install-perl.yml
+  when: modules.perl | default(false)
+
+- import_tasks: install-geoip.yml
+  when: modules.geoip | default(false)
+
+- import_tasks: install-image-filter.yml
+  when: modules.image_filter | default(false)
+
+- import_tasks: install-rtmp.yml
+  when: modules.rtmp | default(false)
+
+- import_tasks: install-xslt.yml
+  when: modules.xslt | default(false)
+
+- import_tasks: install-waf.yml
+  when: modules.waf | default(false) and type == "plus"