diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5de8026..2a48bb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v2.X.Y
+
+### Added
+* Molecule tests for Gentoo (many thanks to @VTimofeenko ! − PR #25).
+
+### Fixed
+* Separate repositories update from installation task (fix #24).
+
 ## v2.0.0
 
 ### Added
diff --git a/tasks/main.yml b/tasks/main.yml
index ea95a97..91c722f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -55,11 +55,16 @@
     loop_var: osname
 
 # Manage packages [[[1
+- name: Update repositories
+  package:
+    update_cache: true
+  when: (nft_enabled|bool and
+         ansible_os_family not in [ 'Gentoo' ])
+
 - name: Ensure Nftables packages are in their desired state
   package:
     name: '{{ nft_pkg_list | list }}'
     state: '{{ nft_pkg_state }}'
-    # update_cache: true
   register: pkg_install_result
   until: pkg_install_result is success
   when: nft_enabled|bool