diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index bec5d2dbe53..520649c4ca3 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,7 +20,7 @@
 FROM ubuntu:22.04
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.19.2.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.3.0-SNAPSHOT"  Author="Apache CloudStack <dev@cloudstack.apache.org>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin
index 26cab95d31e..1ee72be68f2 100644
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@ -20,7 +20,7 @@
 FROM python:2
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.19.2.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.3.0-SNAPSHOT"  Author="Apache CloudStack <dev@cloudstack.apache.org>"
 
 ENV WORK_DIR=/marvin
 
diff --git a/tools/docker/Dockerfile.smokedev b/tools/docker/Dockerfile.smokedev
index 4476f6a3d5f..610f5ef80a9 100644
--- a/tools/docker/Dockerfile.smokedev
+++ b/tools/docker/Dockerfile.smokedev
@@ -19,8 +19,7 @@
 
 FROM ubuntu:16.04
 
-MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0-SNAPSHOT" Author="Apache CloudStack <dev@cloudstack.apache.org>"
 
 RUN apt-get -y update && apt-get install -y \
     genisoimage \
diff --git a/ui/Dockerfile b/ui/Dockerfile
index d636ae5657e..f5556234e19 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -19,11 +19,11 @@
 
 FROM node:14-bullseye AS build
 
-MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
 LABEL Description="Apache CloudStack UI; Modern role-base progressive UI for Apache CloudStack"
 LABEL Vendor="Apache.org"
 LABEL License=ApacheV2
 LABEL Version=0.5.0
+LABEL Author="Apache CloudStack <dev@cloudstack.apache.org>"
 
 WORKDIR /build
 
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index d2ecbdcf9ec..2570d8a2651 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -47,7 +47,7 @@ export default {
         return filters
       },
       columns: () => {
-        const fields = ['displayname', 'state', 'ipaddress']
+        const fields = ['name', 'state', 'ipaddress']
         const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal',
           {
             memoryused: (record) => {
@@ -77,7 +77,7 @@ export default {
         fields.push('zonename')
         return fields
       },
-      searchFilters: ['displayname', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
+      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
       details: () => {
         var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename',
           'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account',