diff --git a/service-cli/service-cli-runner/src/main/resources/template/deploy.ftl b/service-cli/service-cli-runner/src/main/resources/template/deploy.ftl
index 7539982..4c8c230 100644
--- a/service-cli/service-cli-runner/src/main/resources/template/deploy.ftl
+++ b/service-cli/service-cli-runner/src/main/resources/template/deploy.ftl
@@ -15,13 +15,14 @@ security_darkcode='${runtime.security.darkcode}'
 
 <#list hosts as host>
 host=${host}
-hostname=`ssh $host 'hostname -f'`
+hostname=`ssh $host 'hostname'`
+hostname_full=`ssh $host 'hostname -f'`
 echo "${info.name} $host $hostname $datetime"
 ssh $host 'bash -s' < stop.sh ${runtime.jarPath}/${info.name}.jar
 <#if selectedHosts?seq_contains(host)>
 ssh $host "mkdir -p ${runtime.jarPath};curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/${info.sourceJar} -o ${runtime.jarPath}/${info.name}.jar"
 start_time=`date +%Y%m%d%H%M%S`
-ssh $host "export JASYPT_ENCRYPTOR_PASSWORD='r#(R,P\"Dp^A47>WSn:Wn].gs/+\"v:q_Q*An~zF*g-@j@jtSTv5H/,S-3:R?r9R}.';nohup ${runtime.jdkPath} <#list environments?keys as key>-D${key?replace("_", ".")}=${environments[key]?string} </#list>-jar ${runtime.jarPath}/${info.name}.jar<#noparse> --datetime=${datetime} --hostname=${hostname} --deploy.datetime=${datetime} --deploy.ip=${host} --deploy.hostname=${hostname} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --spring.cloud.zookeeper.discovery.metadata.startTime=${start_time} --spring.cloud.zookeeper.discovery.metadata.hostIp=${host} --spring.security.meta.authority='${security_authority}' --spring.security.meta.username='${security_username}' --spring.security.meta.darkcode='${security_darkcode}'</#noparse> <#list arguments?keys as key>--${key?replace("_", ".")}=${arguments[key]?string} </#list>> /dev/null 2>&1 &"
+ssh $host "export JASYPT_ENCRYPTOR_PASSWORD='r#(R,P\"Dp^A47>WSn:Wn].gs/+\"v:q_Q*An~zF*g-@j@jtSTv5H/,S-3:R?r9R}.';nohup ${runtime.jdkPath} <#list environments?keys as key>-D${key?replace("_", ".")}=${environments[key]?string} </#list>-jar ${runtime.jarPath}/${info.name}.jar<#noparse> --datetime=${datetime} --hostname=${hostname} --deploy.datetime=${datetime} --deploy.ip=${host} --deploy.hostname=${hostname} --deploy.hostname-full=${hostname_full} --deploy.start-time=${start_time} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --spring.security.meta.authority='${security_authority}' --spring.security.meta.username='${security_username}' --spring.security.meta.darkcode='${security_darkcode}'</#noparse> <#list arguments?keys as key>--${key?replace("_", ".")}=${arguments[key]?string} </#list>> /dev/null 2>&1 &"
 </#if>
 echo ''
 </#list>
diff --git a/service-configuration/src/main/resources/application-discovery.yml b/service-configuration/src/main/resources/application-discovery.yml
index c4cf30e..a599e18 100644
--- a/service-configuration/src/main/resources/application-discovery.yml
+++ b/service-configuration/src/main/resources/application-discovery.yml
@@ -8,4 +8,8 @@ spring:
         root: /hudi-services
         instance-id: ${spring.application.name}-${deploy.hostname}-${random.uuid}-${deploy.datetime:19700101}
         metadata:
-          discovery: zookeeper
\ No newline at end of file
+          discovery: zookeeper
+          ip: ${deploy.ip}
+          hostname: ${deploy.hostname}
+          hostname_full: ${deploy.hostname-full}
+          start_time: ${deploy.start-time}
\ No newline at end of file
diff --git a/service-web/src/main/resources/logback-spring.xml b/service-web/src/main/resources/logback-spring.xml
index d65b0a1..f272f36 100644
--- a/service-web/src/main/resources/logback-spring.xml
+++ b/service-web/src/main/resources/logback-spring.xml
@@ -6,8 +6,6 @@
     <springProperty scope="context" name="LOKI_PUSH_URL" source="loki.url"/>
     <springProperty scope="context" name="LOGGING_PARENT" source="logging.parent"/>
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
-    <springProperty scope="context" name="DEPLOY_HOSTNAME" source="deploy.hostname"/>
-    <springProperty scope="context" name="DEPLOY_IP" source="deploy.ip"/>
 
     <appender name="Loki" class="com.github.loki4j.logback.Loki4jAppender">
         <metricsEnabled>true</metricsEnabled>
@@ -16,7 +14,7 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:-none},host=${DEPLOY_HOSTNAME:-none},ip=${DEPLOY_IP:-none},level=%level</pattern>
+                <pattern>app=${APP_NAME:-none},host=${HOSTNAME:-none},level=%level</pattern>
                 <readMarkers>true</readMarkers>
             </label>
             <message>