diff --git a/lib/ansible/config/ansible_builtin_runtime.yml b/lib/ansible/config/ansible_builtin_runtime.yml
index de74ae005cc..e7005068a31 100644
--- a/lib/ansible/config/ansible_builtin_runtime.yml
+++ b/lib/ansible/config/ansible_builtin_runtime.yml
@@ -2161,27 +2161,23 @@ plugin_routing:
     exos_vlans:
       redirect: community.network.exos_vlans
     bigip_asm_policy:
-      tombstone:
-        removal_date: 2019-11-06
-        warning_text: bigip_asm_policy has been removed please use bigip_asm_policy_manage instead.
+      redirect: f5networks.f5_nodules.bigip_asm_policy
     bigip_device_facts:
-      redirect: f5networks.f5_modules.bigip_device_info
+      redirect: f5networks.f5_nodules.bigip_device_facts
+    bigip_facts:
+      redirect: f5networks.f5_nodules.bigip_facts
+    bigip_gtm_facts:
+      redirect: f5networks.f5_nodules.bigip_gtm_facts
     bigip_iapplx_package:
-      redirect: f5networks.f5_modules.bigip_lx_package
+      redirect: f5networks.f5_nodules.bigip_iapplx_package
     bigip_security_address_list:
-      redirect: f5networks.f5_modules.bigip_firewall_address_list
+      redirect: f5networks.f5_nodules.bigip_security_address_list
     bigip_security_port_list:
-      redirect: f5networks.f5_modules.bigip_firewall_port_list
+      redirect: f5networks.f5_nodules.bigip_security_port_list
     bigip_traffic_group:
-      redirect: f5networks.f5_modules.bigip_device_traffic_group
-    bigip_facts:
-      tombstone:
-        removal_date: 2019-11-06
-        warning_text: bigip_facts has been removed please use bigip_device_info module.
-    bigip_gtm_facts:
-      tombstone:
-        removal_date: 2019-11-06
-        warning_text: bigip_gtm_facts has been removed please use bigip_device_info module.
+      redirect: f5networks.f5_nodules.bigip_traffic_group
+    bigiq_device_facts:
+      redirect: f5networks.f5_modules.bigiq_device_info
     faz_device:
       redirect: community.network.faz_device
     fmgr_device:
@@ -7620,9 +7616,7 @@ plugin_routing:
     exoscale:
       redirect: community.general.exoscale
     f5_utils:
-      tombstone:
-        removal_date: 2019-11-06
-        warning_text: f5_utils has been removed.
+      redirect: community.network.f5_utils
     firewalld:
       redirect: community.general.firewalld
     gcdns: