diff --git a/manifests/init.pp b/manifests/init.pp
index 4fca84e3..0e9fa9bd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -65,10 +65,10 @@
   Boolean $oracle_use_sid                                           = true,
   $dbschema                                                         = undef,
   # MySQL Connector Settings
-  $mysql_connector_manage                                           = true,
-  $mysql_connector_version                                          = '5.1.34',
-  $mysql_connector_product                                          = 'mysql-connector-java',
-  $mysql_connector_format                                           = 'tar.gz',
+  Boolean $mysql_connector_manage                                   = true,
+  String $mysql_connector_version                                   = '8.0.23',
+  String $mysql_connector_product                                   = 'mysql-connector-java',
+  String $mysql_connector_format                                    = 'tar.gz',
   Stdlib::Absolutepath $mysql_connector_install                     = '/opt/MySQL-connector',
   Stdlib::HTTPUrl $mysql_connector_url                              = 'https://dev.mysql.com/get/Downloads/Connector-J',
   Optional[Integer[0]] $pool_min_size                               = undef,
@@ -143,6 +143,7 @@
   Hash $proxy                                                       = {},
   # Options for the AJP connector
   Hash $ajp                                                         = {},
+  Boolean $tomcat_default_connector                                 = true,
   # Additional connectors in server.xml
   Jira::Tomcat_connectors $tomcat_additional_connectors             = {},
   # Context path (usualy used in combination with a reverse proxy)
diff --git a/spec/classes/jira_config_spec.rb b/spec/classes/jira_config_spec.rb
index 101edd04..2e9a58d6 100644
--- a/spec/classes/jira_config_spec.rb
+++ b/spec/classes/jira_config_spec.rb
@@ -446,11 +446,12 @@
             end
           end
 
-          context 'tomcat additional connectors' do
+          context 'tomcat additional connectors, without default' do
             let(:params) do
               {
                 version: '8.13.5',
                 javahome: '/opt/java',
+                tomcat_default_connector: false,
                 tomcat_additional_connectors: {
                   8081 => {
                     'URIEncoding' => 'UTF-8',
@@ -475,6 +476,7 @@
 
             it do
               is_expected.to contain_file('/opt/jira/atlassian-jira-software-8.13.5-standalone/conf/server.xml').
+                without_content(%r{<Connector port="8080"}).
                 with_content(%r{<Connector port="8081"}).
                 with_content(%r{connectionTimeout="20000"}).
                 with_content(%r{protocol="HTTP/1\.1"}).
diff --git a/templates/server.xml.epp b/templates/server.xml.epp
index b1742e3e..cbe256b7 100644
--- a/templates/server.xml.epp
+++ b/templates/server.xml.epp
@@ -25,6 +25,7 @@
     <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
 
     <Service name="Catalina">
+<% if $jira::tomcat_default_connector { -%>
         <Connector port="<%= $jira::tomcat_port %>"
                    <%- if $jira::tomcat_address { -%>
                    address="<%= $jira::tomcat_address %>"
@@ -55,6 +56,7 @@
 <%   } -%>
 <% } -%>
         />
+<%- } -%>
 
 <% if $jira::tomcat_native_ssl { -%>
         <Connector