diff --git a/charts/service-gateway/templates/gateway/gwclass.yaml b/charts/service-gateway/templates/gateway/gwclass.yaml
index 89f045d79..6331d992c 100644
--- a/charts/service-gateway/templates/gateway/gwclass.yaml
+++ b/charts/service-gateway/templates/gateway/gwclass.yaml
@@ -7,14 +7,16 @@ spec:
   parametersRef:
     group: gateway.envoyproxy.io
     kind: EnvoyProxy
-    name: {{ include "tenant.name" . }}-gw-proxy-config
+    name: {{ include "tenant.name" . }}
     namespace: {{ .Release.Namespace }}
 ---
 apiVersion: gateway.envoyproxy.io/v1alpha1
 kind: EnvoyProxy
 metadata:
-  name: {{ include "tenant.name" . }}-gw-proxy-config
+  name: {{ include "tenant.name" . }}
   namespace: {{ .Release.Namespace }}
+  annotations:
+    {{- dict "catalog.appscode.com/gateway-config" (dict "service" .Values.envoy.service "vaultServer" .Values.vaultServer | toYaml) | toYaml | nindent 4 }}
 spec:
   mergeGateways: true
   provider: