diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index af7b067cb..5e627d215 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -240,6 +240,7 @@ tripleo::profile::base::database::mysql::mysql_server_options:
   'mysqld':
     bind-address: "%{hiera('controller_host')}"
     innodb_file_per_table: 'ON'
+    connect_timeout: 60
 mysql::server::restart: true
 mysql::server::root_password: {{UNDERCLOUD_DB_PASSWORD}}
 
diff --git a/releasenotes/notes/mysql-timeout-ec1444c45da24a1e.yaml b/releasenotes/notes/mysql-timeout-ec1444c45da24a1e.yaml
new file mode 100644
index 000000000..4e27d908d
--- /dev/null
+++ b/releasenotes/notes/mysql-timeout-ec1444c45da24a1e.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Set the connect_timeout to 60s for mysql connections. This helps fix an
+    issue where undercloud services lose the mysql connection if it takes more
+    than 10s to complete (eg under high load).