diff --git a/playbooks/common-playbooks/cinder.yml b/playbooks/common-playbooks/cinder.yml
index f2de6b9d1c..04d1900121 100644
--- a/playbooks/common-playbooks/cinder.yml
+++ b/playbooks/common-playbooks/cinder.yml
@@ -42,7 +42,8 @@
         - always
 
     - name: Determine storage bridge IP address
-      include_tasks: ../common-tasks/dynamic-address-fact.yml
+      include_role:
+        name: openstack.osa.dynamic_address_fact
       vars:
         network_address: "storage_address"
       tags:
diff --git a/playbooks/common-playbooks/neutron.yml b/playbooks/common-playbooks/neutron.yml
index ce67d90fc1..c5ca129dd7 100644
--- a/playbooks/common-playbooks/neutron.yml
+++ b/playbooks/common-playbooks/neutron.yml
@@ -42,7 +42,8 @@
         - always
 
     - name: Determine tunnel bridge IP address
-      include_tasks: ../common-tasks/dynamic-address-fact.yml
+      include_role:
+        name: openstack.osa.dynamic_address_fact
       vars:
         network_address: "tunnel_address"
       tags:
diff --git a/playbooks/common-tasks/dynamic-address-fact.yml b/playbooks/common-tasks/dynamic-address-fact.yml
deleted file mode 100644
index 804d513ba2..0000000000
--- a/playbooks/common-tasks/dynamic-address-fact.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# Copyright 2017, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Gathering facts for {{ network_address }} interface on metal hosts
-  setup:
-    gather_subset: "!all,network"
-    filter: "{{ dynamic_address_gather_filter | default(('ansible_' ~ default_network_interface_name) | replace('-','_')) }}"
-  vars:
-    default_network_interface_name: "{{ container_networks[network_address]['bridge'] | default }}"
-  when:
-    - is_metal
-    - (dynamic_address_gather_filter is defined) or (default_network_interface_name | length > 0)
-  tags:
-    - common-address
-    - always
-
-- name: Set IP to use for {{ network_address }}
-  set_fact: "{{ network_address }}={{ hostvars[inventory_hostname] | json_query(query) }}"
-  vars:
-    query: "{{ is_metal | ternary(metal_query, non_metal_query) }}"
-    non_metal_query: "container_networks.{{ network_address }}.address || ansible_host"
-    find_bridge: "container_networks.{{ network_address }}.bridge"
-    metal_query: "ansible_facts.\"{{ hostvars[inventory_hostname] | json_query(find_bridge) | replace('-','_') }}\".ipv4.address || {{ non_metal_query }}"
-  tags:
-    - common-address
-    - always