diff --git a/roles/jira_config/defaults/main.yml b/roles/jira_config/defaults/main.yml
index 0a90817..5aab24b 100644
--- a/roles/jira_config/defaults/main.yml
+++ b/roles/jira_config/defaults/main.yml
@@ -22,6 +22,11 @@ atl_tomcat_redirectport: ""
 atl_tomcat_scheme: "http"
 atl_tomcat_secure: "false"
 
+# Mitigation of potentially stuck threads with certain network setup while using PostgreSQL
+# https://confluence.atlassian.com/jirakb/connection-problems-to-postgresql-result-in-stuck-threads-in-jira-1047534091.html
+atl_db_keepalive: 'true'
+atl_db_sockettimeout: '240'
+
 atl_db_poolminsize: '20'
 atl_db_poolmaxsize: '100'
 atl_db_minidle: '10'
diff --git a/roles/jira_config/molecule/default/tests/test_default.py b/roles/jira_config/molecule/default/tests/test_default.py
index 77508f0..4ec770c 100644
--- a/roles/jira_config/molecule/default/tests/test_default.py
+++ b/roles/jira_config/molecule/default/tests/test_default.py
@@ -15,6 +15,8 @@ def test_dbconfig_file(host):
     assert f.contains("<username>atljira</username>")
     assert f.contains("<password>molecule_password</password>")
 
+    assert f.contains("<connection-properties>tcpKeepAlive=true;socketTimeout=240</connection-properties>")
+
     assert f.contains("<pool-min-size>1111</pool-min-size>")
     assert f.contains("<pool-max-size>1111</pool-max-size>")
     assert f.contains("<pool-min-idle>1111</pool-min-idle>")
diff --git a/roles/jira_config/molecule/jira_config_props/converge.yml b/roles/jira_config/molecule/jira_config_props/converge.yml
index 9ef9fa9..7e86b81 100644
--- a/roles/jira_config/molecule/jira_config_props/converge.yml
+++ b/roles/jira_config/molecule/jira_config_props/converge.yml
@@ -13,6 +13,8 @@
     atl_jvm_heap: 'PLACEHOLDER'
     atl_jvm_opts: 'PLACEHOLDER'
     atl_cluster_node_id: 'FAKEID'
+    atl_db_keepalive: 'false'
+    atl_db_sockettimeout: '111'
     atl_db_poolminsize: 1111
     atl_db_poolmaxsize: 1111
     atl_db_minidle: 1111
diff --git a/roles/jira_config/molecule/jira_config_props/tests/test_default.py b/roles/jira_config/molecule/jira_config_props/tests/test_default.py
index 70329f1..6351261 100644
--- a/roles/jira_config/molecule/jira_config_props/tests/test_default.py
+++ b/roles/jira_config/molecule/jira_config_props/tests/test_default.py
@@ -15,6 +15,8 @@ def test_dbconfig_file(host):
     assert f.contains("<username>atljira</username>")
     assert f.contains("<password>molecule_password</password>")
 
+    assert f.contains("<connection-properties>tcpKeepAlive=false;socketTimeout=111</connection-properties>")
+
     assert f.contains("<pool-min-size>1111</pool-min-size>")
     assert f.contains("<pool-max-size>1111</pool-max-size>")
     assert f.contains("<pool-min-idle>1111</pool-min-idle>")
diff --git a/roles/jira_config/templates/dbconfig.xml.j2 b/roles/jira_config/templates/dbconfig.xml.j2
index 992a3f6..c2b92c4 100644
--- a/roles/jira_config/templates/dbconfig.xml.j2
+++ b/roles/jira_config/templates/dbconfig.xml.j2
@@ -10,6 +10,9 @@
     <username>{{ atl_jdbc_user }}</username>
     <password>{{ atl_jdbc_password | replace("&", "&amp;") }}</password>
     <driver-class>{{ atl_db_driver }}</driver-class>
+    {% if 'postgres' in atl_db_type %}
+      <connection-properties>tcpKeepAlive={{ atl_db_keepalive }};socketTimeout={{ atl_db_sockettimeout }}</connection-properties>
+    {% endif %}
 
     <pool-min-size>{{ atl_db_poolminsize }}</pool-min-size>
     <pool-max-size>{{ atl_db_poolmaxsize }}</pool-max-size>