diff --git a/bin/serve-https.js b/bin/serve-https.js
index 6fde3bf..b0cc66f 100755
--- a/bin/serve-https.js
+++ b/bin/serve-https.js
@@ -141,13 +141,17 @@ function createServer(port, _delete_me_, content, opts) {
       'localhost.daplie.me': null
     };
     opts.httpsOptions.SNICallback = function (sni, cb ) {
+      var tlsOptions;
       console.log('[https] sni', sni);
 
       // Static Certs
-      if ('localhost.daplie.me' === sni) {
+      if (/.*localhost.*\.daplie\.me/.test(sni.toLowerCase())) {
         // TODO implement
         if (!secureContexts[sni]) {
-          secureContexts[sni] = tls.createSecureContext(require('localhost.daplie.me-certificates').merge({}));
+          tlsOptions = require('localhost.daplie.me-certificates').mergeTlsOptions(sni, {});
+        }
+        if (tlsOptions) {
+          secureContexts[sni] = tls.createSecureContext(tlsOptions);
         }
         cb(null, secureContexts[sni]);
         return;