diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb83f6aa..e5574db4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The **patch** part changes incrementally at each release.
 * mysql: activate binary logs by specifying log_bin path
 * mysql: specify a custom server_id
 * mysql: option to define as read only
+* nginx: make default vhost configurable
 * packweb-apache: Install zip & unzip by default
 * php: Install php-sqlite by default
 * php: Don't disable putenv() by default in PHP settings
diff --git a/nginx/defaults/main.yml b/nginx/defaults/main.yml
index 932356b0..d59da758 100644
--- a/nginx/defaults/main.yml
+++ b/nginx/defaults/main.yml
@@ -22,3 +22,10 @@ nginx_evolinux_default_enabled: True
 
 nginx_serverstatus_suffix: ""
 nginx_serverstatus_suffix_file: "/etc/evolinux/nginx_serverstatus_suffix"
+
+nginx_force_default_template: False
+nginx_default_template_regular: "evolinux-default.conf.j2"
+nginx_default_template_minimal: "evolinux-default.minimal.conf.j2"
+
+nginx_service_state: started
+nginx_service_enabled: True
diff --git a/nginx/tasks/main_minimal.yml b/nginx/tasks/main_minimal.yml
index 58d177af..798cf055 100644
--- a/nginx/tasks/main_minimal.yml
+++ b/nginx/tasks/main_minimal.yml
@@ -12,9 +12,10 @@
 
 - name: Copy default vhost
   template:
-    src: evolinux-default.minimal.conf.j2
+    src: "{{ nginx_default_template_minimal }}"
     dest: /etc/nginx/sites-available/evolinux-default.minimal.conf
     mode: 0644
+    force: "{{ nginx_force_default_template | default(False) }}"
   notify: reload nginx
   tags:
   - nginx
diff --git a/nginx/tasks/main_regular.yml b/nginx/tasks/main_regular.yml
index 99080a5e..45e5ba47 100644
--- a/nginx/tasks/main_regular.yml
+++ b/nginx/tasks/main_regular.yml
@@ -89,10 +89,10 @@
 
 - name: nginx vhost is installed
   template:
-    src: evolinux-default.conf.j2
+    src: "{{ nginx_default_template_regular }}"
     dest: /etc/nginx/sites-available/evolinux-default.conf
     mode: "0640"
-    force: no
+    force: "{{ nginx_force_default_template | default(False) }}"
   notify: reload nginx
   tags:
     - nginx
diff --git a/nginx/tasks/packages.yml b/nginx/tasks/packages.yml
index ccbd3705..76350424 100644
--- a/nginx/tasks/packages.yml
+++ b/nginx/tasks/packages.yml
@@ -7,7 +7,15 @@
   apt:
     name: "{{ nginx_package_name }}"
     state: present
-  notify: restart nginx
+  tags:
+    - nginx
+    - packages
+    
+- name: Ensure nginx service is running as configured.
+  service:
+    name: nginx
+    state: "{{ nginx_service_state }}"
+    enabled: "{{ nginx_service_enabled }}"
   tags:
     - nginx
     - packages