diff --git a/deployed-server/deployed-neutron-port.yaml b/deployed-server/deployed-neutron-port.yaml
index 662bc4e4ec..91c3c168db 100644
--- a/deployed-server/deployed-neutron-port.yaml
+++ b/deployed-server/deployed-neutron-port.yaml
@@ -33,6 +33,9 @@ parameters:
   replacement_policy:
     default: ''
     type: string
+  tags:
+    default: []
+    type: comma_delimited_list
   DeployedServerPortMap:
     default: {}
     type: json
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index aec59ac999..aa8cdbe65e 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -1102,6 +1102,12 @@ resources:
         - [{subnet: {get_attr: [ServiceNetMap, vip_subnet_map, ctlplane]}}]
         - get_param: ControlFixedIPs
       replacement_policy: AUTO
+      tags:
+        - tripleo_vip_net=ctlplane
+        - str_replace:
+            template: tripleo_stack_name=$STACK_NAME
+            params:
+              $STACK_NAME: {get_param: 'OS::stack_name'}
 
   RedisVirtualIP:
     depends_on: [Networks, ServiceNetMap]