diff --git a/Sanity/geoip-support/main.fmf b/Sanity/geoip-support/main.fmf
index afa9ebd..11f656f 100644
--- a/Sanity/geoip-support/main.fmf
+++ b/Sanity/geoip-support/main.fmf
@@ -2,17 +2,13 @@ summary: it tries more ip address from more locations
 tier: '1'
 description: ''
 contact: Petr Sklenar <psklenar@redhat.com>
-component:
-  - bind
 test: ./runtest.sh
 framework: beakerlib
 recommend:
-  - bind
   - libmaxminddb
   - libmaxminddb-devel
   - geolite2-country
   - geolite2-city
-  - bind-utils
 duration: 66m
 enabled: true
 tag:
@@ -23,6 +19,14 @@ tag:
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1564443
 adjust:
+  - recommend+:
+      - bind
+      - bind-utils
+    when: component == bind
+  - recommend+:
+      - bind9-next
+      - bind9-next-utils
+    when: component == bind9-next
   - enabled: false
     when: distro < rhel-8
     continue: false
diff --git a/Sanity/geoip-support/runtest.sh b/Sanity/geoip-support/runtest.sh
index 229f2e2..f49b9fb 100755
--- a/Sanity/geoip-support/runtest.sh
+++ b/Sanity/geoip-support/runtest.sh
@@ -28,7 +28,7 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
-PACKAGE="bind"
+: ${PACKAGE:="bind"}
 
 rlJournalStart
     rlPhaseStartSetup