diff --git a/group_vars/all/archweb.yml b/group_vars/all/archweb.yml
index 44bdccadf4dbfad2bd2f6e9dc4ee622b292a0fc7..d2b707f3e94d6cd16f9f763a97c0991c4e6c7d6a 100644
--- a/group_vars/all/archweb.yml
+++ b/group_vars/all/archweb.yml
@@ -1,11 +1,20 @@
 $ANSIBLE_VAULT;1.1;AES256
-61373130666134363630336235326331396634393437353839653163313238633833353661613662
-3562663866666337656161663330383665643839626139300a376437613930303562623264363664
-63323236383034616566316334323439663166636361333338383536333866323437306264623363
-3362663536623735320a313434643866363336346636303431306230383665663566636530666432
-38333932353535646666626637363431316631356439623134336439396631323162613432323137
-64653534616263623139373561306461353739613963303639636139386131383861363338313636
-30653234643865343833663835663662383636353535623063333162356533643430306134326239
-39343462623962643830623131326138353865306137343137333338323738373666623361336332
-66386334376537313162373564386534656135343266303239333662643938653330616638333337
-6437383736313733663062663230663530633361376633373631
+65633636613766313863666361643338646438343264323039656632306337313666386261636539
+6436643237633235336163653733663630396238313337640a313939313062383462313066636338
+64326135396461336139343730313234623833643135323561626336623663366465663630326437
+3336383164623039620a626533376130633134613565383762653533333937333838363032646437
+32323235333661666332333030363630336435343966396261383466393831353230666538316533
+32613765373236313563666335653935646331623132363739393833343235643638356534376363
+36663634346135623836356265343462653933666231343434633561626136306435373266373735
+38333239313762396364383563653238373939313164613432353162303431396166646532366634
+31383731303436353731303739373038333633646165333735383531316638653463656166383739
+63333232313937313934373364336634363235656462613339666535626232333339396364613231
+32643438396630313033336532393837663538643339333733333134323632363965656333646137
+62343034613936393833316562366132343636363634306561363263376135353861653436613633
+33616462666662626264303066353535653634323565653033666265613662343666643530666535
+32613038663638356134616233343836393534386466656564363836626339373631663363333434
+61356134383265396335633236663261353137613037303363613635323265363663356366666364
+61323239306533373862646132623764336530646134626461346466363266646266383635366231
+35613835313661656163623364383162323234303265333636616133353732343866396632353538
+33656538383036626332623464366539613632343565393665333966636437663937633137663466
+363663343236636536353430313064663163
diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml
index 34727cdcc46bbbf9047bec9f45506cc2be1a0e8d..3070ebbe185409d1e70c188e8d1ae8f0a7a4a2b7 100644
--- a/roles/archweb/defaults/main.yml
+++ b/roles/archweb/defaults/main.yml
@@ -7,3 +7,10 @@ archweb_pgp_import: false
 archweb_keyring: '/etc/pacman.d/gnupg/pubring.gpg'
 archweb_reporead: false
 archweb_services: false
+
+archweb_db: 'archweb'
+archweb_db_host: 'localhost'
+archweb_db_site_user: 'archweb'
+archweb_db_services_user: 'archweb_services'
+archweb_db_dbscripts_user: 'archweb_dbscripts'
+archweb_db_backup_user: 'archweb_backup'
diff --git a/roles/archweb/templates/archweb-pgp_import.service.j2 b/roles/archweb/templates/archweb-pgp_import.service.j2
index bfa2b64f66fed89c1599edc0bb3e37860e58554e..f405a1542413a619d31a95490ca8bb0aa975a308 100644
--- a/roles/archweb/templates/archweb-pgp_import.service.j2
+++ b/roles/archweb/templates/archweb-pgp_import.service.j2
@@ -1,5 +1,5 @@
 [Unit]
-Description=archewb pgp_import
+Description=archweb pgp_import
 
 [Service]
 Type=oneshot