diff --git a/deployment/puppet/openstack/templates/30-server-remote-log.conf.erb b/deployment/puppet/openstack/templates/30-server-remote-log.conf.erb
index b063cdb2e4..6bcd24478b 100644
--- a/deployment/puppet/openstack/templates/30-server-remote-log.conf.erb
+++ b/deployment/puppet/openstack/templates/30-server-remote-log.conf.erb
@@ -11,9 +11,9 @@ $Template RemoteLog, "%timegenerated:1:15:date-rfc3164% %syslogseverity-text%: %
 $ActionFileDefaultTemplate RemoteLog
 
 # Would match 'kernel:' -> 'kernel'  ;  'rsyslogd[12345]:' -> 'rsyslogd'  ;  '<180>(nova.api.wsgi):'  ->  'nova.api.wsgi'  ;  'install/anaconda'  ->  'install/anaconda'
-$template RemoteLogFile, "/var/log/remote/%FROMHOST%/%syslogtag:R,ERE,1,DFLT:([A-Za-z][A-Za-z0-9_./-]*)--end%.log"
+$template RemoteLogFile, "/var/log/remote/%fromhost-ip%/%syslogtag:R,ERE,1,DFLT:([A-Za-z][A-Za-z0-9_./-]*)--end%.log"
 # Hardcode destination for puppet logs
-$template PuppetApplyLogFile, "/var/log/remote/%FROMHOST%/puppet-apply.log"
+$template PuppetApplyLogFile, "/var/log/remote/%fromhost-ip%/puppet-apply.log"
 
 # Parse puppet logs
 :syslogtag, regex, "puppet-user" ?PuppetApplyLogFile;RemoteLog
@@ -21,5 +21,5 @@ $template PuppetApplyLogFile, "/var/log/remote/%FROMHOST%/puppet-apply.log"
 :syslogtag, regex, "puppet-error" ?PuppetApplyLogFile;RemoteLog
 &~
 
-:FROMHOST, regex, "^[1-9]" ?RemoteLogFile;RemoteLog
+:fromhost-ip, regex, "^[1-9]" ?RemoteLogFile;RemoteLog
 &~