diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fd811019..92c6ccaa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Changelog
 
-## 0.25.1
+## 0.25.1 (Unreleased)
 
 BUG FIXES:
 
-- Ansible and Jinja software versions validation tasks in ansible check mode.
+- Fix Ansible and Jinja versions validation tasks in ansible check mode.
+- Correctly use the `nginx_version` (if defined) for NGINX module versions.
 
 ## 0.25.0 (Nov 28, 2024)
 
diff --git a/molecule/version/converge.yml b/molecule/version/converge.yml
index 6d81759f9..1078d6d0c 100644
--- a/molecule/version/converge.yml
+++ b/molecule/version/converge.yml
@@ -36,14 +36,12 @@
           - name: brotli
             version: "{{ ngx_version }}"
           - name: geoip
-            version: "{{ ngx_version }}"
           - name: image-filter
             version: "{{ ngx_version }}"
           - name: njs
             state: present
             version: "{{ njs_version }}"
           - name: perl
-            version: "{{ ngx_version }}"
           - name: xslt
             version: "{{ ngx_version }}"
         nginx_service_modify: true
diff --git a/tasks/modules/install-modules.yml b/tasks/modules/install-modules.yml
index adbd1a4a4..d8264828b 100644
--- a/tasks/modules/install-modules.yml
+++ b/tasks/modules/install-modules.yml
@@ -28,7 +28,7 @@
 - name: Install NGINX modules
   ansible.builtin.package:
     name: "nginx-{{ (nginx_type == 'plus') | ternary('plus-', '') }}module-{{ item['name'] | default(item) }}\
-          {{ (nginx_repository is not defined and ansible_facts['os_family'] == 'Alpine' and nginx_type != 'plus') | ternary('@nginx', '') }}{{ item['version'] | default('') }}"
+          {{ (nginx_repository is not defined and ansible_facts['os_family'] == 'Alpine' and nginx_type != 'plus') | ternary('@nginx', '') }}{{ item['version'] | default((nginx_version is defined) | ternary(nginx_version, '')) }}"
     state: "{{ item['state'] | default('present') }}"
   loop: "{{ nginx_modules }}"
   when: