diff --git a/octavia/files/pike/octavia_api.conf b/octavia/files/pike/octavia_api.conf
index bdb77a8..934d6d8 100644
--- a/octavia/files/pike/octavia_api.conf
+++ b/octavia/files/pike/octavia_api.conf
@@ -5,48 +5,6 @@
 # From octavia
 #
 
-# The host IP to bind to (IP address value)
-#bind_host = 127.0.0.1
-bind_host = {{ api.bind.address }}
-
-# The port to bind to (port value)
-# Minimum value: 0
-# Maximum value: 65535
-#bind_port = 9876
-bind_port = {{ api.bind.port }}
-
-# The auth strategy for API requests. (string value)
-# Allowed values: noauth, keystone
-#auth_strategy = noauth
-
-# The handler that the API communicates with (string value)
-#api_handler = queue_producer
-
-# The API paste config file to use (string value)
-#api_paste_config = api-paste.ini
-
-# The path for API extensions (string value)
-#api_extensions_path =
-
-# Enable/disable exposing API endpoints (boolean value)
-# api_v1_enabled = True
-api_v1_enabled = {{ api.get('api_v1_enabled', 'True') }}
-# api_v2_enabled = True
-api_v2_enabled = {{ api.get('api_v2_enabled', 'True') }}
-
-# Allow the usage of the bulk API (boolean value)
-#allow_bulk = true
-
-# Allow the usage of the pagination (boolean value)
-#allow_pagination = false
-
-# Allow the usage of the sorting (boolean value)
-#allow_sorting = false
-
-# The maximum number of items returned in a single response. The string
-# 'infinite' or a negative integer value means 'no limit' (string value)
-#pagination_max_limit = -1
-
 # The hostname Octavia is running on (string value)
 #host = example.domain
 
@@ -389,6 +347,58 @@
 # value means endless wait. (integer value)
 #graceful_shutdown_timeout = 60
 
+[api_settings]
+
+#
+# From octavia
+#
+
+# The host IP to bind to (IP address value)
+#bind_host = 127.0.0.1
+bind_host = {{ api.bind.address }}
+
+# The port to bind to (port value)
+# Minimum value: 0
+# Maximum value: 65535
+#bind_port = 9876
+bind_port = {{ api.bind.port }}
+
+# The auth strategy for API requests. (string value)
+# Allowed values: noauth, keystone
+#auth_strategy = keystone
+
+# The handler that the API communicates with (string value)
+#api_handler = queue_producer
+
+# Allow the usage of the pagination (boolean value)
+#allow_pagination = false
+
+# Allow the usage of the sorting (boolean value)
+#allow_sorting = false
+
+# Allow the usage of the filtering (boolean value)
+#allow_filtering = false
+
+# Allow the usage of the field selection (boolean value)
+#allow_field_selection = false
+
+# The maximum number of items returned in a single response.
+# The string 'infinite' or a negative integer value means 'no limit'
+#pagination_max_limit = 'infinite'
+
+# Base URI for the API for use in pagination links.
+# This will be autodetected from the request if not overridden here.
+#api_base_uri = ''
+
+# Enable/disable exposing API endpoints (boolean value)
+# api_v1_enabled = True
+api_v1_enabled = {{ api.get('api_v1_enabled', 'True') }}
+# api_v2_enabled = True
+api_v2_enabled = {{ api.get('api_v2_enabled', 'True') }}
+
+# Allow users to create TLS Terminated listeners
+#allow_tls_terminated_listeners = True
+
 [amphora_agent]
 
 #
@@ -421,26 +431,6 @@
 # From octavia
 #
 
-# Absolute path to the CA Certificate for signing. Defaults
-# to env[OS_OCTAVIA_TLS_CA_CERT].
-# ca_certificate = /etc/ssl/certs/ssl-cert-snakeoil.pem
-
-# Absolute path to the Private Key for signing. Defaults
-# to env[OS_OCTAVIA_TLS_CA_KEY].
-# ca_private_key = /etc/ssl/private/ssl-cert-snakeoil.key
-
-# Passphrase for the Private Key. Defaults
-# to env[OS_OCTAVIA_CA_KEY_PASS] or None.
-# ca_private_key_passphrase =
-
-# Certificate signing digest. Defaults
-# to env[OS_OCTAVIA_CA_SIGNING_DIGEST] or "sha256".
-# signing_digest = sha256
-
-# Absolute path to the certificate storage directory.
-# Defaults to env[OS_OCTAVIA_TLS_STORAGE].
-# storage_path = /var/lib/octavia/certificates/
-
 # Name of the cert manager to use (string value)
 #cert_manager = barbican_cert_manager
 
@@ -477,6 +467,9 @@
 # From octavia
 #
 
+# Number of workers for the controller-worker service.
+#workers=1
+
 # Retry attempts to wait for Amphora to become active (integer value)
 #amp_active_retries = 10
 amp_active_retries = 100
@@ -781,6 +774,15 @@
 #connection_retry_interval = 5
 connection_retry_interval = 1
 
+# Number of amphorae that could be built per controller worker, simultaneously.
+#build_rate_limit=-1
+
+# Retry threshold for waiting for a build slot for an amphorae.
+#build_active_retries=300
+
+# Retry timeout between build attempts in seconds.
+#build_retry_interval=5
+
 # The user group for haproxy to run under inside the amphora. (string value)
 #user_group = nogroup
 
@@ -869,6 +871,12 @@
 # Sleep time between sending heartbeats. (integer value)
 #heartbeat_interval = 10
 
+# Driver for updating amphora health system.
+#health_update_driver=health_db
+
+# Driver for updating amphora statistics.
+#stats_update_driver=stats_db
+
 # Specifies which driver to use for the event_streamer for syncing the octavia
 # and neutron_lbaas dbs. If you don't need to sync the database or are running
 # octavia in stand alone mode use the noop_event_streamer (string value)
@@ -1001,7 +1009,6 @@
 # Its value may be silently ignored in the future.
 # Reason: PKI token format is no longer supported.
 #signing_dir = <None>
-signing_dir = /var/lib/cache/octavia
 
 # Optionally specify a list of memcached server(s) to use for caching. If left
 # undefined, tokens will instead be cached in-process. (list value)
@@ -1169,9 +1176,6 @@
 # From octavia
 #
 
-# Name of amphora internal network (string value)
-#lb_network_name = <None>
-
 # The maximum attempts to retry an action with the networking service. (integer
 # value)
 #max_retries = 15
@@ -1183,6 +1187,15 @@
 # Seconds to wait for a port to detach from an amphora. (integer value)
 #port_detach_timeout = 300
 
+# Can users supply a network_id for their VIP ? (boolean value)
+#allow_vip_network_id = True
+
+# Can users supply a subnet_id for their VIP ? (boolean value)
+#allow_vip_port_id = True
+
+# List of network_ids that are valid for VIP creation.
+# If this field is empty, no validation is performed.
+#valid_vip_networks = <None>
 
 [neutron]
 
@@ -2060,7 +2073,6 @@
 #username = <None>
 username = {{ api.identity.user }}
 
-
 [task_flow]
 
 #
diff --git a/octavia/files/pike/octavia_manager.conf b/octavia/files/pike/octavia_manager.conf
index 8926ffa..6cda13e 100644
--- a/octavia/files/pike/octavia_manager.conf
+++ b/octavia/files/pike/octavia_manager.conf
@@ -6,55 +6,6 @@
 # From octavia
 #
 
-# The host IP to bind to (IP address value)
-#bind_host = 127.0.0.1
-{%- if pillar.octavia.api is defined %}
-bind_host = {{ api.bind.address }}
-{% endif %}
-
-# The port to bind to (port value)
-# Minimum value: 0
-# Maximum value: 65535
-#bind_port = 9876
-{%- if pillar.octavia.api is defined %}
-bind_port = {{ api.bind.port }}
-{% endif %}
-
-# The auth strategy for API requests. (string value)
-# Allowed values: noauth, keystone
-#auth_strategy = noauth
-
-# The handler that the API communicates with (string value)
-#api_handler = queue_producer
-
-# The API paste config file to use (string value)
-#api_paste_config = api-paste.ini
-
-# The path for API extensions (string value)
-#api_extensions_path =
-
-# Enable/disable exposing API endpoints (boolean value)
-# api_v1_enabled = True
-# api_v2_enabled = True
-
-{%- if pillar.octavia.api is defined %}
-api_v1_enabled = {{ api.get('api_v1_enabled', 'True') }}
-api_v2_enabled = {{ api.get('api_v2_enabled', 'True') }}
-{% endif %}
-
-# Allow the usage of the bulk API (boolean value)
-#allow_bulk = true
-
-# Allow the usage of the pagination (boolean value)
-#allow_pagination = false
-
-# Allow the usage of the sorting (boolean value)
-#allow_sorting = false
-
-# The maximum number of items returned in a single response. The string
-# 'infinite' or a negative integer value means 'no limit' (string value)
-#pagination_max_limit = -1
-
 # The hostname Octavia is running on (string value)
 #host = example.domain
 
@@ -397,6 +348,66 @@
 # value means endless wait. (integer value)
 #graceful_shutdown_timeout = 60
 
+
+[api_settings]
+
+#
+# From octavia
+#
+
+# The host IP to bind to (IP address value)
+#bind_host = 127.0.0.1
+{%- if pillar.octavia.api is defined %}
+bind_host = {{ api.bind.address }}
+{% endif %}
+
+# The port to bind to (port value)
+# Minimum value: 0
+# Maximum value: 65535
+#bind_port = 9876
+{%- if pillar.octavia.api is defined %}
+bind_port = {{ api.bind.port }}
+{% endif %}
+
+# The auth strategy for API requests. (string value)
+# Allowed values: noauth, keystone
+#auth_strategy = keystone
+
+# The handler that the API communicates with (string value)
+#api_handler = queue_producer
+
+# Allow the usage of the pagination (boolean value)
+#allow_pagination = false
+
+# Allow the usage of the sorting (boolean value)
+#allow_sorting = false
+
+# Allow the usage of the filtering (boolean value)
+#allow_filtering = false
+
+# Allow the usage of the field selection (boolean value)
+#allow_field_selection = false
+
+# The maximum number of items returned in a single response.
+# The string 'infinite' or a negative integer value means 'no limit'
+#pagination_max_limit = 'infinite'
+
+# Base URI for the API for use in pagination links.
+# This will be autodetected from the request if not overridden here.
+#api_base_uri = ''
+
+# Enable/disable exposing API endpoints (boolean value)
+# api_v1_enabled = True
+# api_v2_enabled = True
+
+{%- if pillar.octavia.api is defined %}
+api_v1_enabled = {{ api.get('api_v1_enabled', 'True') }}
+api_v2_enabled = {{ api.get('api_v2_enabled', 'True') }}
+{% endif %}
+
+# Allow users to create TLS Terminated listeners
+#allow_tls_terminated_listeners = True
+
 [amphora_agent]
 
 #
@@ -810,6 +821,15 @@
 #connection_retry_interval = 5
 connection_retry_interval = 1
 
+# Number of amphorae that could be built per controller worker, simultaneously.
+#build_rate_limit=-1
+
+# Retry threshold for waiting for a build slot for an amphorae.
+#build_active_retries=300
+
+# Retry timeout between build attempts in seconds.
+#build_retry_interval=5
+
 # The user group for haproxy to run under inside the amphora. (string value)
 #user_group = nogroup
 
@@ -950,7 +970,7 @@
 # Amphora role and priority advertisement interval in seconds. (integer value)
 #vrrp_advert_int = 1
 
-# VRRP health check script run interval in seconds. (integer value)
+# VRRP check script run interval in seconds. (integer value)
 #vrrp_check_interval = 5
 
 # Number of successive failures before transition to a fail state. (integer
@@ -1035,7 +1055,6 @@
 # Its value may be silently ignored in the future.
 # Reason: PKI token format is no longer supported.
 #signing_dir = <None>
-signing_dir = /var/lib/cache/octavia
 
 # Optionally specify a list of memcached server(s) to use for caching. If left
 # undefined, tokens will instead be cached in-process. (list value)
@@ -1203,9 +1222,6 @@
 # From octavia
 #
 
-# Name of amphora internal network (string value)
-#lb_network_name = <None>
-
 # The maximum attempts to retry an action with the networking service. (integer
 # value)
 #max_retries = 15
@@ -1217,6 +1233,15 @@
 # Seconds to wait for a port to detach from an amphora. (integer value)
 #port_detach_timeout = 300
 
+# Can users supply a network_id for their VIP ? (boolean value)
+#allow_vip_network_id = True
+
+# Can users supply a subnet_id for their VIP ? (boolean value)
+#allow_vip_port_id = True
+
+# List of network_ids that are valid for VIP creation.
+# If this field is empty, no validation is performed.
+#valid_vip_networks = <None>
 
 [neutron]
 
@@ -2094,7 +2119,6 @@
 #username = <None>
 username = {{ manager.identity.user }}
 
-
 [task_flow]
 
 #