diff --git a/Makefile b/Makefile
index b82085f..1e83b26 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 export COMPOSE_FILE=./docker-compose.yml
 export COMPOSE_PROJECT_NAME=publichealth
+export EMAIL=change_me@localhost.localhost
 
 default: build
 
@@ -36,7 +37,7 @@ apply-migrations: migrations migrate
 
 setup:
 	docker-compose exec web ./manage.py migrate
-	docker-compose exec web ./manage.py createsuperuser
+	docker-compose exec web ./manage.py createsuperuser --username admin --email $(EMAIL) --noinput
 	docker-compose exec web ./manage.py compress
 	docker-compose exec web ./manage.py collectstatic
 
diff --git a/ansible/internet.yaml b/ansible/internet.yaml
index f5599ad..33284c0 100644
--- a/ansible/internet.yaml
+++ b/ansible/internet.yaml
@@ -9,7 +9,7 @@
       net.ipv4.ip_forward: 1
   roles:
     - role: dev-sec.os-hardening
-    # - role: dev-sec.ssh-hardening
-    # - role: nginxinc.nginx
-    # - role: dev-sec.nginx-hardening
-    # - role: jnv.unattended-upgrades
+    - role: dev-sec.ssh-hardening
+    - role: nginxinc.nginx
+    - role: dev-sec.nginx-hardening
+    - role: jnv.unattended-upgrades
diff --git a/ansible/inventories/evolution/group_vars/webservers/vars.yaml b/ansible/inventories/evolution/group_vars/webservers/vars.yaml
index ef08c51..48ea110 100644
--- a/ansible/inventories/evolution/group_vars/webservers/vars.yaml
+++ b/ansible/inventories/evolution/group_vars/webservers/vars.yaml
@@ -9,8 +9,9 @@ memcached_memory_allocation_mb: 256
 nginx_worker_processes: 2
 nginx_worker_connections: 1024
 
-domain: "{{ vault_domain }}"
+email_admin: "{{ vault_email_admin }}"
 
+domain: "{{ vault_domain }}"
 allowed_domains: "{{ vault_allowed_domains }}"
 
 django_email_key: "{{ vault_django_email_key }}"
diff --git a/ansible/inventories/evolution/group_vars/webservers/vault.yaml b/ansible/inventories/evolution/group_vars/webservers/vault.yaml
index b9fbe6f..b81a978 100644
--- a/ansible/inventories/evolution/group_vars/webservers/vault.yaml
+++ b/ansible/inventories/evolution/group_vars/webservers/vault.yaml
@@ -1,46 +1,35 @@
 $ANSIBLE_VAULT;1.1;AES256
-66633532633065306238613537323739643935353461666533613435353935386237353935636231
-3235643564396462323063353264633436353335633333660a623236313663336361313739363564
-63653464316464373031383636326465396436373639646136663466343464323262623136303361
-3066653062326230310a393534653837323735393339326434356437373436303634646235396130
-65353635323065343132353162636531653339313665656166393238356232633763653730383633
-32636134336565666564616434373539353031366261303761613361336664353638303739396265
-39666132353966323738623966383439313332323230333462356463353935653635613435393232
-34643436313665663362393037636536386634623137623665663464366563393061643335386433
-63353138653331623331323634663137346661653264326562396136323033346239643962366466
-61313038646233663662363530336365656166646434393737383064653635666361363462633564
-33336335636366373061366361333034353466346631353432633738356464653162373237623066
-36616264323436343465313837326464363531656135626463366432363266363333346533336339
-33643439636562373261663465316134373838323931663539353531643764653338393161653732
-34333434373234636265383564623630613235313932303839336438623639626538383061336130
-61343866656431303034373130636238336463613963366465663862373232626137383336326161
-65323030643735653562313664333363663630613137366136313739373932393235663138333733
-36336163313136623238643239613763653864623765343463333532326534306166306437643831
-38636537333835643635363237303036336432386439643564623632616639323864386630396339
-36663039363462653064623565653364303739643962306531626335393433343334343331663239
-37613337373937343565313866396335366338303532613434653062653763376134383935633430
-61383463326366626536363839373633363330376135306637386335353237303133386264373436
-66666332666665363063316366643331663532323165636634313862663966383531333532663834
-39393664616135326661316264643361316337336636366461366265653062633232653766623432
-32326131303164623234326232616437666436666562376135656339386239336665336236366664
-30353538666330346230303335636361656130633139383334393861393462336265313261313135
-65323430376461336238626632316561366636616139643131346631316138613037346435393938
-61376639343962393535633637346561643339663363356235646363333932346332343639333930
-65653238656636313732316337373432316662626331626134346139396131383764656366316631
-38313464353035626561633536656136306432663565356366333732396262353031653561303636
-37633634393536363964646533333263346231366664323764306233386333353037333766333839
-31396433383331386637613334616665633336623162323161323939646137313535363061306261
-34383765633134616637386566376132393862326666626363646132643365633964376138663263
-64646635663632626165366333636533393966363935616537616138636538373362633334613036
-64396335393264666638333162643866316539663135363263666463643431653631373366323235
-35343731313461316335656231373434393533363433336563646131316464666537356530353263
-65346361653031336236303439396630613130323536313762356135333863383230333637343261
-65326165663239383638393431353936663438366263373238313634653361323037323030363733
-38623532393165393962356437303562653163383032656239616135623162353233373263393264
-36633363633334643637396338383735376663653436346437656235393766356163383964646136
-39306366316439383162653539666636623537643961613432643664653862633430666439626435
-32333734323930613930306561623833303562323564363861313035663636376232616366383663
-33656464663937323933633231323031303937316438346362383663376236623066653332313636
-62306332356462316637653036383761393039643437663339313461613631313037306538653531
-36353033663938313831613565623561343132306463393734326334353135363332643866353038
-35323835343366393466343564343538313837623334393765323530306135343566
+66363630316536316131333937366161306233636266653639363839393639343831333461316264
+6234393462613538323364353937383132316563653031320a643836623266353238346238366264
+63656334613639653862663636633631323764393162373533396435366165643731663537303631
+3535336536366636370a343133623639323661316635656435393366636634633965343335623731
+62393732666463366130666361336663333036396430356531326431666464663831363338353833
+38373034323165333036663066353337643332663639386262653266303163373939656337323433
+36313036643364653366393738333864333266373663643531613762343039333135643839356566
+64396231636339356538373830393963333239636231306633643937356265666335316135643361
+62396262633634363462306239636163663565346361636361336231653064393537316139393935
+65313339613836323836396631396230653266313265326363373365303966366531323438646138
+61656234336138663736376537373062386265303462356561323966386138396631326230633230
+39633936363065623664333335656665363562333962633039663962353166326639353532653731
+34373161393661386232666131376431643732343731616230636332386536613930316361313463
+37616562363362633230663164653638343037393037306262636636303662343361323363336136
+35393834373439626337363633366464376361646634636564633831646639383864656531386230
+65336630326333343130373663346566613031356561346161353162366230333864333766333132
+38373663356136633234613266343865363061656664656666383966623164333835336631633061
+62366664393533386431373265366135303766303733316366363331386166363362386563613031
+37346166373836373437663839663739646166396661343633386233643435363536386334373430
+65303033636464336166363966336335653665306663633432306262626166373865663465656235
+38653163643363346431633333353035626361383730366136646533623931303036386263356233
+32363663326139643065373830386365323638383039356236336330373966643633626638303437
+34383566623733343339336331386231633030643432396264663130616666623636663062633565
+38323139323635373532346331663863343239313163303431653537633839623766373333376261
+66613437376233303035623864363532356139313834366236613764646131363835663963623565
+65336238613665356438376631636163343331366235346537393437313336313437353936336565
+65656431303636383736616465313833353234346362653565346634336634356364643838353637
+34393666633332623235663261636235336662396134346565376436666366613339353065663065
+32333162363132353137613664616338616363643337313161346335323466663334656531616536
+34656266323238663235323466346433303261313633336533663762336161376231366462636136
+30663133316130393733346631333563343830353865623761363266303237643131653864303266
+64663462663830303463313633343938633761313937646434323366633536626331303639363639
+30653436666539366433646464643961643238343633646362303134646634373036633233343535
+3764643337353533376365643662646635313562303532346132
diff --git a/ansible/roles/wagtail/tasks/install.yaml b/ansible/roles/wagtail/tasks/install.yaml
index 30c81ec..3281f0e 100644
--- a/ansible/roles/wagtail/tasks/install.yaml
+++ b/ansible/roles/wagtail/tasks/install.yaml
@@ -22,11 +22,22 @@
     pkg: make
 
 - name: Deploy Wagtail site on Docker
-  shell: make build
+  shell: make build-cached
   args:
     chdir: "{{ release_dir }}"
 
-- name: Set up Wagtail site
+- name: Start Wagtail site
+  shell: make run
+  args:
+    chdir: "{{ release_dir }}"
+
+
+- name: Finish setup of Wagtail site
   shell: make setup
   args:
     chdir: "{{ release_dir }}"
+
+- name: Finish setup of Wagtail site
+  shell: make setup EMAIL={{ email_admin }}
+  args:
+    chdir: "{{ release_dir }}"