diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 822bbf9e..e0c91fd1 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -143,7 +143,6 @@ evolinux_default_www_include: True
 
 evolinux_default_www_files: True
 evolinux_default_www_ssl_cert: True
-evolinux_default_www_ssl_subject: "/CN={{ ansible_fqdn }}"
 
 # hardware
 
diff --git a/evolinux-base/tasks/default_www.yml b/evolinux-base/tasks/default_www.yml
index f3d3a83c..d27ad70f 100644
--- a/evolinux-base/tasks/default_www.yml
+++ b/evolinux-base/tasks/default_www.yml
@@ -28,7 +28,7 @@
 - block:
 
   - name: Create private key and csr for default site ({{ ansible_fqdn }})
-    command: openssl req -newkey rsa:2048 -sha256 -nodes -keyout /etc/ssl/private/{{ ansible_fqdn }}.key -out /etc/ssl/{{ ansible_fqdn }}.csr -batch -subj "{{ evolinux_default_www_ssl_subject }}"
+    command: openssl req -newkey rsa:2048 -sha256 -nodes -keyout /etc/ssl/private/{{ ansible_fqdn }}.key -out /etc/ssl/{{ ansible_fqdn }}.csr -batch -subj "/CN={{ ansible_fqdn }}"
     args:
       creates: "/etc/ssl/private/{{ ansible_fqdn }}.key"
 
diff --git a/webapps/evoadmin-web/defaults/main.yml b/webapps/evoadmin-web/defaults/main.yml
index cdf309a3..58200cf1 100644
--- a/webapps/evoadmin-web/defaults/main.yml
+++ b/webapps/evoadmin-web/defaults/main.yml
@@ -9,7 +9,6 @@ evoadmin_log_dir: "{{ evoadmin_home_dir }}/log"
 evoadmin_scripts_dir: /usr/share/scripts/evoadmin/
 evoadmin_host: "evoadmin.{{ ansible_fqdn }}"
 evoadmin_username: evoadmin
-evoadmin_ssl_subject: "/CN={{ evoadmin_host }}"
 
 evoadmin_enable_vhost: True
 
diff --git a/webapps/evoadmin-web/tasks/ssl.yml b/webapps/evoadmin-web/tasks/ssl.yml
index 1eb354fc..6bdf1421 100644
--- a/webapps/evoadmin-web/tasks/ssl.yml
+++ b/webapps/evoadmin-web/tasks/ssl.yml
@@ -7,7 +7,7 @@
     state: present
 
 - name: Create private key and csr for default site ({{ ansible_fqdn }})
-  command: openssl req -newkey rsa:2048 -sha256 -nodes -keyout /etc/ssl/private/{{ evoadmin_host }}.key -out /etc/ssl/{{ evoadmin_host }}.csr -batch -subj "{{ evoadmin_ssl_subject }}"
+  command: openssl req -newkey rsa:2048 -sha256 -nodes -keyout /etc/ssl/private/{{ evoadmin_host }}.key -out /etc/ssl/{{ evoadmin_host }}.csr -batch -subj "/CN={{ evoadmin_host }}"
   args:
     creates: "/etc/ssl/private/{{ evoadmin_host }}.key"