diff --git a/apps/assets/api/gathered_user.py b/apps/assets/api/gathered_user.py
index c5c9ece64..8fcf59456 100644
--- a/apps/assets/api/gathered_user.py
+++ b/apps/assets/api/gathered_user.py
@@ -16,5 +16,5 @@ class GatheredUserViewSet(OrgModelViewSet):
     serializer_class = GatheredUserSerializer
     extra_filter_backends = [AssetRelatedByNodeFilterBackend]
 
-    filterset_fields = ['asset', 'username', 'present', 'asset__ip', 'asset__name', 'asset_id']
-    search_fields = ['username', 'asset__ip', 'asset__name']
+    filterset_fields = ['asset', 'username', 'present', 'asset__address', 'asset__name', 'asset_id']
+    search_fields = ['username', 'asset__address', 'asset__name']
diff --git a/apps/assets/models/asset/common.py b/apps/assets/models/asset/common.py
index eadb0593c..f94143c6e 100644
--- a/apps/assets/models/asset/common.py
+++ b/apps/assets/models/asset/common.py
@@ -98,7 +98,7 @@ class Asset(AbsConnectivity, NodesRelationMixin, JMSOrgBaseModel):
     objects = AssetManager.from_queryset(AssetQuerySet)()
 
     def __str__(self):
-        return '{0.name}({0.ip})'.format(self)
+        return '{0.name}({0.address})'.format(self)
 
     def get_target_ip(self):
         return self.address
diff --git a/apps/audits/api.py b/apps/audits/api.py
index 42ae0993c..6cb2e1283 100644
--- a/apps/audits/api.py
+++ b/apps/audits/api.py
@@ -144,7 +144,7 @@ class CommandExecutionHostRelationViewSet(OrgRelationMixin, OrgBulkModelViewSet)
         queryset = queryset.annotate(
             asset_display=Concat(
                 F('asset__name'), Value('('),
-                F('asset__ip'), Value(')')
+                F('asset__address'), Value(')')
             )
         )
         return queryset
diff --git a/apps/audits/filters.py b/apps/audits/filters.py
index b8bf466ec..a6c44b5c5 100644
--- a/apps/audits/filters.py
+++ b/apps/audits/filters.py
@@ -49,7 +49,7 @@ class CommandExecutionFilter(BaseFilterSet):
         queryset = queryset.annotate(
             hostname_ip=Concat(
                 F('asset__hostname'), Value('('),
-                F('asset__ip'), Value(')')
+                F('asset__address'), Value(')')
             )
         ).filter(hostname_ip__icontains=value)
         return queryset
diff --git a/apps/perms/api/asset_permission_relation.py b/apps/perms/api/asset_permission_relation.py
index 247333086..d63b326b2 100644
--- a/apps/perms/api/asset_permission_relation.py
+++ b/apps/perms/api/asset_permission_relation.py
@@ -78,7 +78,7 @@ class AssetPermissionAssetRelationViewSet(RelationMixin):
     filterset_fields = [
         'id', 'asset', 'assetpermission',
     ]
-    search_fields = ["id", "asset__name", "asset__ip", "assetpermission__name"]
+    search_fields = ["id", "asset__name", "asset__address", "assetpermission__name"]
 
     def get_queryset(self):
         queryset = super().get_queryset()