diff --git a/octavia/api.sls b/octavia/api.sls
index fe099f1..072bdcb 100644
--- a/octavia/api.sls
+++ b/octavia/api.sls
@@ -6,14 +6,15 @@
   pkg.installed:
   - names: {{ api.pkgs }}
 
-{%- if pillar.octavia.manager is not defined %}
-/etc/octavia/octavia.conf:
+
+/etc/octavia/octavia_api.conf:
   file.managed:
   - source: salt://octavia/files/{{ api.version }}/octavia_api.conf
   - template: jinja
   - require:
     - pkg: octavia_api_packages
 
+{%- if pillar.octavia.manager is not defined %}
 /etc/octavia/certificates/openssl.cnf:
   file.managed:
   - source: salt://octavia/files/{{ api.version }}/certificates/openssl.cnf
@@ -30,9 +31,9 @@
 {%- if not grains.get('noservices', False) %}
 octavia_db_manage:
   cmd.run:
-  - name: octavia-db-manage upgrade head
+  - name: octavia-db-manage --config-file /etc/octavia/octavia_api.conf upgrade head
   - require:
-    - file: /etc/octavia/octavia.conf
+    - file: /etc/octavia/octavia_api.conf
 {%- endif %}
 
 {%- if not grains.get('noservices', False) %}
@@ -41,7 +42,7 @@
   - names: {{ api.services }}
   - enable: true
   - watch:
-    - file: /etc/octavia/octavia.conf
+    - file: /etc/octavia/octavia_api.conf
   - require:
     - cmd: octavia_db_manage
 {%- endif %}
diff --git a/octavia/manager.sls b/octavia/manager.sls
index a99d77d..e5505c0 100644
--- a/octavia/manager.sls
+++ b/octavia/manager.sls
@@ -12,7 +12,7 @@
   - names: {{ manager.pkgs }}
 
 {%- if image_mine_data and network_mine_data and secgroup_mine_data %}
-/etc/octavia/octavia.conf:
+/etc/octavia/octavia_manager.conf:
   file.managed:
   - source: salt://octavia/files/{{ manager.version }}/octavia_manager.conf
   - template: jinja
@@ -98,7 +98,7 @@
   - names: {{ manager.services }}
   - enable: true
   - watch:
-    - file: /etc/octavia/octavia.conf
+    - file: /etc/octavia/octavia_manager.conf
 {%- endif %}
 {%- endif %}