diff --git a/roles/bootstrap/templates/nginx_config.conf.j2 b/roles/bootstrap/templates/nginx_config.conf.j2
index fd6a8db..dedf52f 100644
--- a/roles/bootstrap/templates/nginx_config.conf.j2
+++ b/roles/bootstrap/templates/nginx_config.conf.j2
@@ -76,7 +76,7 @@ server {
   {{ well_known_section(webroot_path, challenge_proxy) }}
 
   {% if ssl_exists %}
-  listen              443 ssl;
+  listen              443 ssl http2;
   {{ ssl_section() }}
   access_log          /var/log/nginx/{{ service_domain }}.ssl.access.log combined;
   error_log           /var/log/nginx/{{ service_domain }}.ssl.error.log;
@@ -102,7 +102,7 @@ server {
   server_name         {{ service_domain }};
 
   {% if ssl_exists %}
-  listen              443 ssl;
+  listen              443 ssl http2;
   {{ ssl_section() }}
   access_log          /var/log/nginx/{{ service_domain }}.ssl.access.log combined;
   error_log           /var/log/nginx/{{ service_domain }}.ssl.error.log;
diff --git a/roles/bootstrap/templates/nginx_ssl_params.conf.j2 b/roles/bootstrap/templates/nginx_ssl_params.conf.j2
index fff92c3..b89d092 100644
--- a/roles/bootstrap/templates/nginx_ssl_params.conf.j2
+++ b/roles/bootstrap/templates/nginx_ssl_params.conf.j2
@@ -1,6 +1,6 @@
-ssl_prefer_server_ciphers on;
-ssl_ciphers         EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA512:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EDH+aRSA:EECDH:!aNULL:!eNULL:!LOW:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS;
-ssl_protocols       TLSv1.2 TLSv1.1 TLSv1;
+ssl_prefer_server_ciphers off;
+ssl_ciphers         ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
+ssl_protocols       TLSv1.2 TLSv1.3;
 ssl_session_cache   shared:TLS:2m;
 ssl_session_timeout 5m;
 ssl_dhparam         /etc/ssl/private/dhparam.pem;