diff --git a/etc/kayobe/kolla/config/octavia/client.cert-and-key.pem b/etc/kayobe/environments/staging/kolla/config/octavia/client.cert-and-key.pem
similarity index 100%
rename from etc/kayobe/kolla/config/octavia/client.cert-and-key.pem
rename to etc/kayobe/environments/staging/kolla/config/octavia/client.cert-and-key.pem
diff --git a/etc/kayobe/kolla/config/octavia/client_ca.cert.pem b/etc/kayobe/environments/staging/kolla/config/octavia/client_ca.cert.pem
similarity index 100%
rename from etc/kayobe/kolla/config/octavia/client_ca.cert.pem
rename to etc/kayobe/environments/staging/kolla/config/octavia/client_ca.cert.pem
diff --git a/etc/kayobe/kolla/config/octavia/client_ca.key.pem b/etc/kayobe/environments/staging/kolla/config/octavia/client_ca.key.pem
similarity index 100%
rename from etc/kayobe/kolla/config/octavia/client_ca.key.pem
rename to etc/kayobe/environments/staging/kolla/config/octavia/client_ca.key.pem
diff --git a/etc/kayobe/kolla/config/octavia/server_ca.cert.pem b/etc/kayobe/environments/staging/kolla/config/octavia/server_ca.cert.pem
similarity index 100%
rename from etc/kayobe/kolla/config/octavia/server_ca.cert.pem
rename to etc/kayobe/environments/staging/kolla/config/octavia/server_ca.cert.pem
diff --git a/etc/kayobe/kolla/config/octavia/server_ca.key.pem b/etc/kayobe/environments/staging/kolla/config/octavia/server_ca.key.pem
similarity index 100%
rename from etc/kayobe/kolla/config/octavia/server_ca.key.pem
rename to etc/kayobe/environments/staging/kolla/config/octavia/server_ca.key.pem