diff --git a/devstack/etc/rsyslog/10-octavia-log-offloading.conf b/devstack/etc/rsyslog/10-octavia-log-offloading.conf
index 45a8e7c657..7d02757b1d 100644
--- a/devstack/etc/rsyslog/10-octavia-log-offloading.conf
+++ b/devstack/etc/rsyslog/10-octavia-log-offloading.conf
@@ -8,9 +8,9 @@ module(load="imudp")
 input(type="imudp" port=["%ADMIN_PORT%", "%TENANT_PORT%"])
 
 if ($inputname == "imudp" and $syslogfacility-text == "local0" and $syslogseverity-text == "info") then {
-    action(type="omfile" FileCreateMode="0644" File="/var/log/octavia-tenant-traffic.log")&stop
+    action(type="omfile" FileCreateMode="0644" File="/var/log/octavia/octavia-tenant-traffic.log")&stop
 }
 
 if ($inputname == "imudp" and $syslogfacility-text != "local0") then {
-    action(type="omfile" FileCreateMode="0644" File="/var/log/octavia-amphora.log")&stop
+    action(type="omfile" FileCreateMode="0644" File="/var/log/octavia/octavia-amphora.log")&stop
 }
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index c1702014ac..b5ec7d38ef 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -621,11 +621,26 @@ function configure_octavia_api_haproxy {
 }
 
 function configure_rsyslog {
+    sudo mkdir -m 775 /var/log/octavia
+    sudo chgrp syslog /var/log/octavia
+
     sudo cp ${OCTAVIA_DIR}/devstack/etc/rsyslog/10-octavia-log-offloading.conf /etc/rsyslog.d/
     sudo sed -e "
         s|%ADMIN_PORT%|${OCTAVIA_AMP_LOG_ADMIN_PORT}|g;
         s|%TENANT_PORT%|${OCTAVIA_AMP_LOG_TENANT_PORT}|g;
     " -i /etc/rsyslog.d/10-octavia-log-offloading.conf
+
+    # Temporary backward compatibility symbolic link.
+    # Remove in the next "I" cycle
+    sudo touch /var/log/octavia/octavia-tenant-traffic.log
+    sudo chmod 664 /var/log/octavia/octavia-tenant-traffic.log
+    sudo chgrp syslog /var/log/octavia/octavia-tenant-traffic.log
+    sudo ln -s /var/log/octavia/octavia-tenant-traffic.log /var/log/octavia-tenant-traffic.log
+
+    sudo touch /var/log/octavia/octavia-amphora.log
+    sudo chmod 664 /var/log/octavia/octavia-amphora.log
+    sudo chgrp syslog /var/log/octavia/octavia-amphora.log
+    sudo ln -s /var/log/octavia/octavia-amphora.log /var/log/octavia-amphora.log
 }
 
 function octavia_start {
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 56e0931d2b..72ddd2e988 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -74,8 +74,8 @@
       tox_envlist: all
       zuul_copy_output:
         '/var/log/dib-build/': 'logs'
-        '/var/log/octavia-tenant-traffic.log': 'logs'
-        '/var/log/octavia-amphora.log': 'logs'
+        '/var/log/octavia/octavia-tenant-traffic.log': 'logs'
+        '/var/log/octavia/octavia-amphora.log': 'logs'
 
 - job:
     name: octavia-grenade-skip-level