diff --git a/examples/authelia/tests.json b/examples/authelia/tests.json
index edb0fd9d6..dce84e981 100644
--- a/examples/authelia/tests.json
+++ b/examples/authelia/tests.json
@@ -7,12 +7,14 @@
     {
       "type": "string",
       "url": "https://app1.example.com",
-      "string": "authelia"
+      "string": "authelia",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com",
-      "string": "authelia"
+      "string": "authelia",
+      "tls": "app2.example.com"
     }
   ]
 }
diff --git a/examples/autoconf-configs/tests.json b/examples/autoconf-configs/tests.json
index 5c4596e1f..dc92c1d69 100644
--- a/examples/autoconf-configs/tests.json
+++ b/examples/autoconf-configs/tests.json
@@ -7,17 +7,20 @@
     {
       "type": "string",
       "url": "https://app1.example.com/hello",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com/hello",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
     },
     {
       "type": "string",
       "url": "https://app3.example.com/hello",
-      "string": "app3"
+      "string": "app3",
+      "tls": "app3.example.com"
     }
   ]
 }
diff --git a/examples/cors/tests.json b/examples/cors/tests.json
index e3d40e664..f0cf07835 100644
--- a/examples/cors/tests.json
+++ b/examples/cors/tests.json
@@ -6,17 +6,20 @@
     {
       "type": "string",
       "url": "https://app1.example.com",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
     },
     {
       "type": "string",
       "url": "https://app3.example.com",
-      "string": "app3"
+      "string": "app3",
+      "tls": "app3.example.com"
     }
   ]
 }
diff --git a/examples/docker-configs/tests.json b/examples/docker-configs/tests.json
index 54eb9ee94..c9bb815c2 100644
--- a/examples/docker-configs/tests.json
+++ b/examples/docker-configs/tests.json
@@ -7,22 +7,26 @@
     {
       "type": "string",
       "url": "https://app1.example.com/hello",
-      "string": "world"
+      "string": "world",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com/hello",
-      "string": "world"
+      "string": "world",
+      "tls": "app2.example.com"
     },
     {
       "type": "string",
       "url": "https://app1.example.com/app1",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com/app2",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
     }
   ]
 }
diff --git a/examples/drupal/tests.json b/examples/drupal/tests.json
index cc1edd375..258a1ed3a 100644
--- a/examples/drupal/tests.json
+++ b/examples/drupal/tests.json
@@ -8,7 +8,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "drupal"
+      "string": "drupal",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/ghost/tests.json b/examples/ghost/tests.json
index b96fecbf2..8a571690c 100644
--- a/examples/ghost/tests.json
+++ b/examples/ghost/tests.json
@@ -7,7 +7,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "ghost"
+      "string": "ghost",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/gogs/tests.json b/examples/gogs/tests.json
index c2c13d113..c554f85f3 100644
--- a/examples/gogs/tests.json
+++ b/examples/gogs/tests.json
@@ -8,7 +8,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "gogs"
+      "string": "gogs",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/hardened/tests.json b/examples/hardened/tests.json
index 18bddaba9..0f4732cff 100644
--- a/examples/hardened/tests.json
+++ b/examples/hardened/tests.json
@@ -6,7 +6,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/joomla/tests.json b/examples/joomla/tests.json
index 02fec41c3..329bd57e4 100644
--- a/examples/joomla/tests.json
+++ b/examples/joomla/tests.json
@@ -7,7 +7,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "joomla"
+      "string": "joomla",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/kubernetes-configs/tests.json b/examples/kubernetes-configs/tests.json
index e0d4e97e0..036ec69ff 100644
--- a/examples/kubernetes-configs/tests.json
+++ b/examples/kubernetes-configs/tests.json
@@ -7,32 +7,38 @@
     {
       "type": "string",
       "url": "https://app1.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app2.example.com"
     },
     {
       "type": "string",
       "url": "https://app3.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app3.example.com"
     },
     {
       "type": "string",
       "url": "https://app1.example.com/app1",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com/app2",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
     },
     {
       "type": "string",
       "url": "https://app3.example.com/app3",
-      "string": "app3"
+      "string": "app3",
+      "tls": "app3.example.com"
     }
   ]
 }
diff --git a/examples/kubernetes-ingress/tests.json b/examples/kubernetes-ingress/tests.json
index 6747d7608..5049e3bee 100644
--- a/examples/kubernetes-ingress/tests.json
+++ b/examples/kubernetes-ingress/tests.json
@@ -7,17 +7,20 @@
     {
       "type": "string",
       "url": "https://app1.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app2.example.com"
     },
     {
       "type": "string",
       "url": "https://app3.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app3.example.com"
     }
   ]
 }
diff --git a/examples/load-balancer/tests.json b/examples/load-balancer/tests.json
index a64188350..2191f2994 100644
--- a/examples/load-balancer/tests.json
+++ b/examples/load-balancer/tests.json
@@ -7,7 +7,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/mattermost/tests.json b/examples/mattermost/tests.json
index 677272a67..749ea3955 100644
--- a/examples/mattermost/tests.json
+++ b/examples/mattermost/tests.json
@@ -7,7 +7,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "mattermost"
+      "string": "mattermost",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/mongo-express/tests.json b/examples/mongo-express/tests.json
index ff82bce43..968f1d5fc 100644
--- a/examples/mongo-express/tests.json
+++ b/examples/mongo-express/tests.json
@@ -8,7 +8,8 @@
     {
       "type": "status",
       "url": "https://www.example.com",
-      "status": 401
+      "status": 401,
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/moodle/tests.json b/examples/moodle/tests.json
index 580a2fcc7..135f89925 100644
--- a/examples/moodle/tests.json
+++ b/examples/moodle/tests.json
@@ -7,7 +7,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "moodle"
+      "string": "moodle",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/nextcloud/tests.json b/examples/nextcloud/tests.json
index e6847a0bf..b93006fde 100644
--- a/examples/nextcloud/tests.json
+++ b/examples/nextcloud/tests.json
@@ -8,7 +8,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "nextcloud"
+      "string": "nextcloud",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/passbolt/tests.json b/examples/passbolt/tests.json
index 952a214c7..e8ba50c57 100644
--- a/examples/passbolt/tests.json
+++ b/examples/passbolt/tests.json
@@ -6,7 +6,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "passbolt"
+      "string": "passbolt",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/php-multisite/tests.json b/examples/php-multisite/tests.json
index 8181d1938..f49238822 100644
--- a/examples/php-multisite/tests.json
+++ b/examples/php-multisite/tests.json
@@ -6,12 +6,14 @@
     {
       "type": "string",
       "url": "https://app1.example.com",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
     }
   ]
 }
diff --git a/examples/php-singlesite/tests.json b/examples/php-singlesite/tests.json
index b2e929ede..dcaa9a5d1 100644
--- a/examples/php-singlesite/tests.json
+++ b/examples/php-singlesite/tests.json
@@ -6,7 +6,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/prestashop/tests.json b/examples/prestashop/tests.json
index 073d74a36..354b54baf 100644
--- a/examples/prestashop/tests.json
+++ b/examples/prestashop/tests.json
@@ -7,7 +7,8 @@
     {
       "type": "string",
       "url": "https://www.example.com/administration",
-      "string": "prestashop"
+      "string": "prestashop",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/radarr/tests.json b/examples/radarr/tests.json
index 763183c9c..029d4f1f3 100644
--- a/examples/radarr/tests.json
+++ b/examples/radarr/tests.json
@@ -7,7 +7,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "radarr"
+      "string": "radarr",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/redmine/tests.json b/examples/redmine/tests.json
index bd20684e3..20f255049 100644
--- a/examples/redmine/tests.json
+++ b/examples/redmine/tests.json
@@ -7,7 +7,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "redmine"
+      "string": "redmine",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/reverse-proxy-multisite/tests.json b/examples/reverse-proxy-multisite/tests.json
index ec5a029ab..1cb634231 100644
--- a/examples/reverse-proxy-multisite/tests.json
+++ b/examples/reverse-proxy-multisite/tests.json
@@ -7,12 +7,14 @@
     {
       "type": "string",
       "url": "https://app1.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app2.example.com"
     }
   ]
 }
diff --git a/examples/reverse-proxy-singlesite/tests.json b/examples/reverse-proxy-singlesite/tests.json
index 43d9c6fd7..3acf24671 100644
--- a/examples/reverse-proxy-singlesite/tests.json
+++ b/examples/reverse-proxy-singlesite/tests.json
@@ -8,12 +8,14 @@
     {
       "type": "string",
       "url": "https://www.example.com/app1",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
     },
     {
       "type": "string",
       "url": "https://www.example.com/app2",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/swarm-configs/tests.json b/examples/swarm-configs/tests.json
index 36e8be26a..53c474dae 100644
--- a/examples/swarm-configs/tests.json
+++ b/examples/swarm-configs/tests.json
@@ -6,32 +6,38 @@
     {
       "type": "string",
       "url": "https://app1.example.com/app1",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com/app2",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
     },
     {
       "type": "string",
       "url": "https://app3.example.com/app3",
-      "string": "app3"
+      "string": "app3",
+      "tls": "app3.example.com"
     },
     {
       "type": "string",
       "url": "https://app1.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app1.example.com"
     },
     {
       "type": "string",
       "url": "https://app2.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app2.example.com"
     },
     {
       "type": "string",
       "url": "https://app3.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app3.example.com"
     }
   ]
 }
diff --git a/examples/tomcat/tests.json b/examples/tomcat/tests.json
index cd5550005..fe413a747 100644
--- a/examples/tomcat/tests.json
+++ b/examples/tomcat/tests.json
@@ -6,7 +6,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "tomcat"
+      "string": "tomcat",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/examples/wordpress/tests.json b/examples/wordpress/tests.json
index 5f87a4b3e..1b7450ab5 100644
--- a/examples/wordpress/tests.json
+++ b/examples/wordpress/tests.json
@@ -8,7 +8,8 @@
     {
       "type": "string",
       "url": "https://www.example.com",
-      "string": "wordpress"
+      "string": "wordpress",
+      "tls": "www.example.com"
     }
   ]
 }
diff --git a/src/common/core/misc/jobs/default-server-cert.py b/src/common/core/misc/jobs/default-server-cert.py
index 846e1a1cb..0e894cf50 100644
--- a/src/common/core/misc/jobs/default-server-cert.py
+++ b/src/common/core/misc/jobs/default-server-cert.py
@@ -47,7 +47,7 @@ try:
                     "-days",
                     "3650",
                     "-subj",
-                    "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/",
+                    "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=www.example.org/",
                 ],
                 stdin=DEVNULL,
                 stderr=DEVNULL,