diff --git a/src/config.yaml b/src/config.yaml
index 7d8c85a2..d6e8ee3a 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -195,4 +195,27 @@ options:
     description: |
       Number of days left for the Octavia certificates, used for secure
       communication between the controller and the amphora instances,
-      to expire before raising a Critical alert.
\ No newline at end of file
+      to expire before raising a Critical alert.
+  connection-max-retries:
+    default: 120
+    type: int
+    description: |
+      Retry threshold for connecting to amphorae. This is used when waiting
+      for a new amphora to become available as well as during a failover.
+  connection-retry-interval:
+    default: 5
+    type: int
+    description: |
+      Retry timeout between connection attempts in seconds. This is used
+      when waiting for a new amphora to become available as well as during a
+      failover.
+  active-connection-max-retries:
+    default: 15
+    type: int
+    description: |
+      Retry threshold for connecting to an active amphora.
+  active-connection-retry-interval:
+    default: 2
+    type: int
+    description: |
+      Retry timeout between connection attempts in seconds for active amphora.
diff --git a/src/templates/victoria/octavia.conf b/src/templates/victoria/octavia.conf
index a356e313..b6da7e40 100644
--- a/src/templates/victoria/octavia.conf
+++ b/src/templates/victoria/octavia.conf
@@ -100,6 +100,11 @@ server_ca = {{ options.issuing_cacert }}
 # This certificate is used by the ``Octavia`` controller when it takes on the
 # role as a "client" connecting to the ``Amphorae``.
 client_cert = {{ options.controller_cert }}
+connection_max_retries = {{ options.connection_max_retries }}
+connection_retry_interval = {{ options.connection_retry_interval }}
+active_connection_max_retries = {{ options.active_connection_max_retries }}
+active_connection_retry_interval = {{ options.active_connection_retry_interval }}
+
 
 {% include "parts/section-database" %}
 
diff --git a/src/templates/xena/octavia.conf b/src/templates/xena/octavia.conf
index 4e8ca3fb..1f1bfa6d 100644
--- a/src/templates/xena/octavia.conf
+++ b/src/templates/xena/octavia.conf
@@ -105,6 +105,10 @@ server_ca = {{ options.issuing_cacert }}
 # This certificate is used by the ``Octavia`` controller when it takes on the
 # role as a "client" connecting to the ``Amphorae``.
 client_cert = {{ options.controller_cert }}
+connection_max_retries = {{ options.connection_max_retries }}
+connection_retry_interval = {{ options.connection_retry_interval }}
+active_connection_max_retries = {{ options.active_connection_max_retries }}
+active_connection_retry_interval = {{ options.active_connection_retry_interval }}
 
 {% include "parts/section-database" %}