diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
index 6da6d7ec625..e67740b936e 100644
--- a/build/yamls/antrea-ipsec.yml
+++ b/build/yamls/antrea-ipsec.yml
@@ -239,7 +239,7 @@ subjects:
 ---
 apiVersion: v1
 data:
-  antrea-agent.conf: |
+  antrea-agent.conf: |-
     # Name of the OpenVSwitch bridge antrea-agent will create and use.
     # Make sure it doesn't conflict with your existing OpenVSwitch bridges.
     #ovsBridge: br-int
@@ -299,7 +299,7 @@ data:
             "type": "host-local"
         }
     }
-  antrea-controller.conf: |
+  antrea-controller.conf: |-
     # Enable metrics exposure via Prometheus. Initializes Prometheus metrics listener.
     #enablePrometheusMetrics: false
 
@@ -313,7 +313,7 @@ metadata:
   annotations: {}
   labels:
     app: antrea
-  name: antrea-config-gb44hgb5c9
+  name: antrea-config-ffmk8fd5g4
   namespace: kube-system
 ---
 apiVersion: v1
@@ -330,8 +330,8 @@ kind: Service
 metadata:
   annotations:
     prometheus.io/port: "443"
+    prometheus.io/scheme: https
     prometheus.io/scrape: "true"
-    prometheus.io/scheme: "https"
   labels:
     app: antrea
   name: antrea
@@ -391,7 +391,6 @@ spec:
         name: antrea-controller
         ports:
         - containerPort: 443
-          name: https
           protocol: TCP
         readinessProbe:
           failureThreshold: 5
@@ -420,7 +419,7 @@ spec:
         key: node-role.kubernetes.io/master
       volumes:
       - configMap:
-          name: antrea-config-gb44hgb5c9
+          name: antrea-config-ffmk8fd5g4
         name: antrea-config
 ---
 apiVersion: apiregistration.k8s.io/v1
@@ -456,8 +455,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/port: "10443"
+        prometheus.io/scheme: https
         prometheus.io/scrape: "true"
-        prometheus.io/scheme: "https"
       labels:
         app: antrea
         component: antrea-agent
@@ -624,7 +623,7 @@ spec:
         operator: Exists
       volumes:
       - configMap:
-          name: antrea-config-gb44hgb5c9
+          name: antrea-config-ffmk8fd5g4
         name: antrea-config
       - hostPath:
           path: /etc/cni/net.d
diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
index 22e3301d813..019932c9fad 100644
--- a/build/yamls/antrea.yml
+++ b/build/yamls/antrea.yml
@@ -239,7 +239,7 @@ subjects:
 ---
 apiVersion: v1
 data:
-  antrea-agent.conf: |
+  antrea-agent.conf: |-
     # Name of the OpenVSwitch bridge antrea-agent will create and use.
     # Make sure it doesn't conflict with your existing OpenVSwitch bridges.
     #ovsBridge: br-int
@@ -299,7 +299,7 @@ data:
             "type": "host-local"
         }
     }
-  antrea-controller.conf: |
+  antrea-controller.conf: |-
     # Enable metrics exposure via Prometheus. Initializes Prometheus metrics listener.
     #enablePrometheusMetrics: false
 
@@ -313,7 +313,7 @@ metadata:
   annotations: {}
   labels:
     app: antrea
-  name: antrea-config-d9ffttg984
+  name: antrea-config-k49g4578m4
   namespace: kube-system
 ---
 apiVersion: v1
@@ -321,8 +321,8 @@ kind: Service
 metadata:
   annotations:
     prometheus.io/port: "443"
+    prometheus.io/scheme: https
     prometheus.io/scrape: "true"
-    prometheus.io/scheme: "https"
   labels:
     app: antrea
   name: antrea
@@ -382,7 +382,6 @@ spec:
         name: antrea-controller
         ports:
         - containerPort: 443
-          name: https
           protocol: TCP
         readinessProbe:
           failureThreshold: 5
@@ -411,7 +410,7 @@ spec:
         key: node-role.kubernetes.io/master
       volumes:
       - configMap:
-          name: antrea-config-d9ffttg984
+          name: antrea-config-k49g4578m4
         name: antrea-config
 ---
 apiVersion: apiregistration.k8s.io/v1
@@ -447,8 +446,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/port: "10443"
+        prometheus.io/scheme: https
         prometheus.io/scrape: "true"
-        prometheus.io/scheme: "https"
       labels:
         app: antrea
         component: antrea-agent
@@ -583,7 +582,7 @@ spec:
         operator: Exists
       volumes:
       - configMap:
-          name: antrea-config-d9ffttg984
+          name: antrea-config-k49g4578m4
         name: antrea-config
       - hostPath:
           path: /etc/cni/net.d