diff --git a/.gitignore b/.gitignore
index d4017d4..5c199eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,3 @@
 # ---> Ansible
 *.retry
 
-ansible.cfg
-hosts.yml
-host_vars/10.11.12.35
-
-/roles/audiobookshelf/vars/main.yml
-/roles/borgbackup/vars/main.yml
-/roles/defaults/vars/main.yml
-/roles/gitea/vars/main.yml
-/roles/nextcloud/vars/main.yml
-/roles/npm/vars/main.yml
-/roles/vaultwarden/vars/main.yml
-/roles/wiki_js/vars/main.yml
\ No newline at end of file
diff --git a/ansible.cfg b/ansible.cfg
new file mode 100644
index 0000000..2cc9f33
--- /dev/null
+++ b/ansible.cfg
@@ -0,0 +1,5 @@
+[defaults]
+remote_user = simon
+inventory = hosts.yml
+vault_password_file = ~/.ansible/vault_pass.txt
+private_key_file=~/.ssh/ansible
diff --git a/host_vars/10.11.12.35/vars b/host_vars/10.11.12.35/vars
new file mode 100644
index 0000000..1369f99
--- /dev/null
+++ b/host_vars/10.11.12.35/vars
@@ -0,0 +1,70 @@
+################## System Vars ############################
+hostname: "{{ vault_hostname }}"
+domain: "{{ vault_domain }}"
+
+user:
+  name: '{{ vault_user_name }}'
+  password: '{{ vault_user_password }}'
+
+admin_mail: '{{ vault_admin_mail }}'
+sender_address: '{{ vault_sender_address }}'
+
+relay:
+  server: '{{ vault_relay_server }}'
+  port: '{{ vault_relay_port }}'
+  user: '{{ vault_relay_user }}'
+  password: '{{ vault_relay_password }}'
+
+backup_via_samba: '{{ vault_backup_via_samba }}'
+backup_via_nfs: '{{ vault_backup_via_nfs }}'
+
+######################## Service Vars #########################
+
+# Borgbackup
+smb_share: '{{ vault_smb_share }}'
+smb_username: '{{ vault_smb_username }}'
+smb_pass: '{{ vault_smb_pass }}'
+smb_threshold: '{{ vault_smb_threshold }}'
+
+nfs_share: '{{ vault_nfs_share }}'
+nfs_threshold: '{{ vault_nfs_threshold }}'
+
+mount_point: '{{ vault_mount_point }}'
+borg_repo: '{{ vault_repo }}'
+borg_pass: '{{ vault_pass }}'
+
+# Gitea
+GITEA_DB_TYPE: '{{ vault_GITEA_DB_TYPE }}'
+GITEA_DB_HOST: '{{ vault_GITEA_DB_HOST }}'
+GITEA_DB_ROOT_PASS: '{{ vault_GITEA_DB_ROOT_PASS }}'
+GITEA_DB_USER: '{{ vault_GITEA_DB_USER }}'
+GITEA_DB_PASS: '{{ vault_GITEA_DB_PASS }}'
+GITEA_DB_NAME: '{{ vault_GITEA_DB_NAME }}'
+GITEA_ROOT_URL: '{{ vault_GITEA_ROOT_URL }}'
+
+# Nextcloud
+NEXTCLOUD_MYSQL_HOST: '{{ vault_NEXTCLOUD_MYSQL_HOST }}'
+NEXTCLOUD_MYSQL_PORT: '{{ vault_NEXTCLOUD_MYSQL_PORT }}'
+NEXTCLOUD_MYSQL_DB: '{{ vault_NEXTCLOUD_MYSQL_DB }}'
+NEXTCLOUD_MYSQL_USER: '{{ vault_NEXTCLOUD_MYSQL_USER }}'
+NEXTCLOUD_MYSQL_PASS: '{{ vault_NEXTCLOUD_MYSQL_PASS }}'
+NEXTCLOUD_MYSQL_ROOT_PASS: '{{ vault_NEXTCLOUD_MYSQL_ROOT_PASS }}'
+
+# Nginx Proxy Manager
+NPM_MYSQL_HOST: '{{ vault_NPM_MYSQL_HOST }}'
+NPM_MYSQL_PORT: '{{ vault_NPM_MYSQL_PORT }}'
+NPM_MYSQL_DB: '{{ vault_NPM_MYSQL_DB }}'
+NPM_MYSQL_USER: '{{ vault_NPM_MYSQL_USER }}'
+NPM_MYSQL_PASS: '{{ vault_NPM_MYSQL_PASS }}'
+NPM_MYSQL_ROOT_PASS: '{{ vault_NPM_MYSQL_ROOT_PASS }}'
+
+# Vaultwarden
+#VW_ADMIN_TOKEN: '{{ vault_VW_ADMIN_TOKEN }}'
+
+# WikiJS
+WIKI_JS_DB_TYPE: '{{ vault_WIKI_JS_DB_TYPE }}'
+WIKI_JS_DB_HOST: '{{ vault_WIKI_JS_DB_HOST }}'
+WIKI_JS_DB_PORT: '{{ vault_WIKI_JS_DB_PORT }}'
+WIKI_JS_POSTGRES_DB: '{{ vault_WIKI_JS_POSTGRES_DB }}'
+WIKI_JS_POSTGRES_USER: '{{ vault_WIKI_JS_POSTGRES_USER }}'
+WIKI_JS_POSTGRES_PASS: '{{ vault_WIKI_JS_POSTGRES_PASS }}'
\ No newline at end of file
diff --git a/host_vars/10.11.12.35/vault b/host_vars/10.11.12.35/vault
new file mode 100644
index 0000000..9d0d6e5
--- /dev/null
+++ b/host_vars/10.11.12.35/vault
@@ -0,0 +1,96 @@
+$ANSIBLE_VAULT;1.1;AES256
+36336162633434623330663764366462646230663364323631333266623462343762633439353966
+3066383131336437333531363539353263653666393338390a303936393633323163633434616337
+38336362633733636436383335623735383833376262383964643439626437343836346363633466
+6365306665623932350a633439323964306263363432643039383436353538306131356263346332
+61633864393235353265626634636138666535646430326464616231643063333532356664363563
+31653161643762316534376333303362383064636637313366393464386339386630373365613863
+34343964343932393335653337356263656333363466306330323536336430653632356436666163
+37336632623238383030623564353738306165326435363930336362616638376562383831343034
+35343061633038333062326630386137663261633366633466623961326333393338343636376563
+32386165386530346637656638333239393664653330336233623837656362613037633737383536
+31323635653264646239306337656437656138653338353665333533326562396131313031653264
+39656539646638646135333031323032663162643066343032306130333935363266656164663431
+33646662373561353161616633313939626639366232616465643831316365303361636561393065
+30353236313437333531636235353333663231303735636638353235653965626563386162663066
+38363766363566343030306234373434623462393538663531633435333337653632393331336432
+31346466616666663638623665316165386137396131646564363863323066396239333333313539
+66656366313035646338613332303538343439343561396338383166636131663061646265313937
+66363932313233626561663364346633633662396537313663393833393937656636386633663034
+30653334316134393739616335303361356164383134376362343664626438613937623830623332
+31663637303635336436623161663833653338626530373061366131613139353963353932623564
+39613066623835636130386664303230373936336439643032653831353039356135633439653737
+39393263383234656637646438383364656534353637623338633065353561656366393432396138
+66333231323266666165383932616661346163613338633537383866386438656637646465343166
+34346531303330643738313562383935643534633566333533653434333132653232626632336565
+62636634623962346330346238316364316364376135303432323863646333346634353566363138
+33393966363638653135616338316331393065646466343536363865353362373932643730663232
+33353232343431363832323833376663336539306265656632316466343165646137326261363831
+34356365336465633135623865366566356162313166393230333166306433306238353438616463
+31636666653138333235326163656366633337396630366137623430633332316561343661646530
+38383964353266643363643563333535316335343065626337646462613037626636306231656366
+30346631356433376665343961316139373032613839316361656161633035323039646536353030
+37666362363839326661316362303035626430666462633066646532396564386166313966363736
+64316465393634616431363234376162323564643837653537343764613639626339326637623934
+33363363623661356539663736393836653132313461316662366639623437373664313832373836
+33356337616232373462653865636264323565663233633737386464613738623664633863623036
+34343665396130353066663534383964626565303234626564306431396638333639306131613631
+61653039666139373466306165373937366336313235393838333738303434396632353536363532
+32366662353562303066376334656264633837653936323834623038396566313936323261356133
+62643564643232616639646633643439666361333339356433633135666665623930323638306366
+30653934633330383561366664666366326533336366356162643636663330656531366164373763
+38366466316230343764303566323736643763643062393461316232383532333264323863626338
+65646562376236326533353832323131303233623739373038643430653963653532323935623130
+38306366343037323566346366343430393634333630653535633039623466353539346261626530
+66393362353634343935363263313333666266653039313632646330333063663762326537326331
+37656534313637666439356432323961376233326162393832323935323761616530303233633864
+31623133366366626236316130336164623533633432363236343931646563396465646631653463
+37313537363739323936663861366665333533333763643664323561663063303532386530393133
+66353162386232353032376433343131376635373130396561306239373562633334343630306165
+36663661376133653365366162343431623737613639353637623065663638366334313737643237
+35623033613839633635313530653734626465396632333462396164333232336433666663623739
+38386565383630613234363435653531616535636366316538363661303336663461613564333439
+62323062313837326365373664633036646533656231323062656462373262363863626434663062
+62346337643262323364633332613836336333353061646335326164623433376639646533376565
+38333330386336396361303435626362393735303039376561356634363661666561646630323234
+33376662346262633633333664616130613466343235396633616536663336656165353065313434
+62336632376564636534633132633163666234663232373432613336343930326334303661613261
+62313837626265646630333230643439383131636661366339626662383866333664333266633130
+64623162383737663961303938626533643330353835636231663131646663336163353939363938
+32646364346337323939383461633131656537353532636231333832356161356561383535613130
+39306564613166643338353034366534316233306631333062613737393530663466313235626662
+62313838623161643433366564376337393937626637356232343662663435613037393436653130
+34663063613635633036353564653832643237353538616238376436333339623536626462306263
+38393537303730646634396365363865363931613538326132376562313438326661613161373532
+35623835363432333634353437633831626330343864626530393437316237663034666133613431
+64646336313764623361353338333763633062623162373163353161313230643836383164633235
+66656266323939346465313433356438663537663361366561393137316534323036626536313165
+39623136623931373034353038343030303830393336643163336433633633653664343932653135
+62323939666363623963666138343734333363303435343339616665643562353861646532356433
+62313065373965663461363164346663653634343833323163616362383863306630356334653030
+36646535316336626532323131636131363766646663623065346565313432656130636337623837
+32616533363764383538313263383332623562353535393064663863303932343034306463393135
+37323362376364356638323563383135316264616239366165666461623663653564386461373731
+39323363343130353537363831623663386466333163656365373764343230663132633564356334
+32396632336238623837363766316464653866336134653137353832333031376562356536316666
+30623630373665336536333431666361336532613937313566373965663566393962613633326663
+66663363336136373836636331373639343431366437333434623336623130336435623932353637
+63353763343035363066353835633063633934616334643463336235336531623839376166333263
+33363238646131386666663365633433643030313937333662326461393532636262633061633437
+64626531303037313165656634653235363862303964313835613863633865613037363436636664
+61323133313866656536356338346136313131396139363234613234393237646634376133653633
+66623561663534323630323064373839313462646363326639666236383839643062613463333434
+64373662376430613632313866616339663838313931616231346535653739386462323761373036
+37636531353536653939643335656666333165653130623833616534323364616336626637346365
+32396665323966623335323637666331646336313337303362363739643864386235363464336532
+38623736626337653462306530353536393732386565653432656631636462663032623839323730
+62653464326632393736616436316535333133653033316234626432343336323231613964646664
+39656165333763393361393263643063633932313530666338316335616434383730383934393661
+32633131343264653039366539333930653563366431646265383630373730353038373032383338
+39373661666134653738653632343430663636656162373631336635633136393934623663323131
+39616439623964326466663232343231616631323362333966346530303065303936383938343036
+34366662656134383864313261646238363736343837373162303163323230326361653937346266
+30666431666335616336626636353262613661366137333933656338363736653031346335313238
+36306633633362646638303730393534306330386439643033313430393334386165613439353764
+30323563666466333530366666313962303830333339636630656230666266313063643564623735
+393336336234666665663931316362656337
diff --git a/hosts.yml b/hosts.yml
new file mode 100644
index 0000000..a6dbba6
--- /dev/null
+++ b/hosts.yml
@@ -0,0 +1,31 @@
+---
+all:
+  hosts:
+    10.11.12.35:
+    10.11.12.250:
+  children:
+    docker_hosts:
+      hosts:
+        10.11.12.35:
+        10.11.12.250:
+    npm_hosts:
+      hosts:
+        10.11.12.35:
+    nextcloud_hosts:
+      hosts:
+        10.11.12.35:
+    vaultwarden_hosts:
+      hosts:
+        10.11.12.35:
+    audiobookshelf_hosts:
+      hosts:
+        10.11.12.35:
+    wiki_js_hosts:
+      hosts:
+        10.11.12.35:
+    gitea_hosts:
+      hosts:
+        10.11.12.35:
+    chatpad_hosts:
+      hosts:
+        10.11.12.35:
\ No newline at end of file
diff --git a/roles/audiobookshelf/vars/main.yml.template b/roles/audiobookshelf/defaults/main.yml
similarity index 100%
rename from roles/audiobookshelf/vars/main.yml.template
rename to roles/audiobookshelf/defaults/main.yml
diff --git a/roles/borgbackup/defaults/main.yml b/roles/borgbackup/defaults/main.yml
new file mode 100644
index 0000000..d993d27
--- /dev/null
+++ b/roles/borgbackup/defaults/main.yml
@@ -0,0 +1,5 @@
+borgbackup_deps:
+  - borgbackup
+  - mailutils
+  - cifs-utils
+  - nfs-common
\ No newline at end of file
diff --git a/roles/borgbackup/vars/main.yml.template b/roles/borgbackup/vars/main.yml.template
deleted file mode 100644
index 779e9b9..0000000
--- a/roles/borgbackup/vars/main.yml.template
+++ /dev/null
@@ -1,18 +0,0 @@
-borgbackup_deps:
-  - borgbackup
-  - mailutils
-  - cifs-utils
-  - nfs-common
-
-smb_share: '//smb_server/smb_share'
-smb_username: 'smb_user'
-smb_pass: 'super-secret-pass'
-smb_threshold: '90'
-
-nfs_share: 'nfs-server:nfs-share'
-nfs_threshold: '90'
-
-mount_point: '/mnt'
-borg_repo: 'backup_homesrv'
-borg_pass: 'super-secret-pass'
-sender_address: 'root@hostname.domain'
\ No newline at end of file
diff --git a/roles/docker/vars/main.yml b/roles/docker/defaults/main.yml
similarity index 100%
rename from roles/docker/vars/main.yml
rename to roles/docker/defaults/main.yml
diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml
new file mode 100644
index 0000000..46cb615
--- /dev/null
+++ b/roles/gitea/defaults/main.yml
@@ -0,0 +1,3 @@
+gitea_folder:
+  - db
+  - data
\ No newline at end of file
diff --git a/roles/gitea/vars/main.yml.template b/roles/gitea/vars/main.yml.template
deleted file mode 100644
index f113cfb..0000000
--- a/roles/gitea/vars/main.yml.template
+++ /dev/null
@@ -1,11 +0,0 @@
-gitea_folder:
-  - db
-  - data
-
-GITEA_DB_TYPE: 'mysql'
-GITEA_DB_HOST: 'gitea_db'
-GITEA_DB_ROOT_PASS: 'super-secret-root-pass'
-GITEA_DB_USER: 'gitea'
-GITEA_DB_PASS: 'super-secret-pass'
-GITEA_DB_NAME: 'gitea'
-GITEA_ROOT_URL: 'https://git.your.domain'
\ No newline at end of file
diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml
new file mode 100644
index 0000000..f0e0b18
--- /dev/null
+++ b/roles/nextcloud/defaults/main.yml
@@ -0,0 +1,4 @@
+nextcloud_folder:
+ - data
+ - db
+ - redis
diff --git a/roles/nextcloud/vars/main.yml.template b/roles/nextcloud/vars/main.yml.template
deleted file mode 100644
index 2cee11c..0000000
--- a/roles/nextcloud/vars/main.yml.template
+++ /dev/null
@@ -1,11 +0,0 @@
-nextcloud_folder:
- - data
- - db
- - redis
-
-NEXTCLOUD_MYSQL_HOST: 'nextcloud_db'
-NEXTCLOUD_MYSQL_PORT: '3306'
-NEXTCLOUD_MYSQL_DB: nextcloud
-NEXTCLOUD_MYSQL_USER: nextcloud
-NEXTCLOUD_MYSQL_PASS: 'super-secret-pass'
-NEXTCLOUD_MYSQL_ROOT_PASS: 'super-secret-root-pass'
\ No newline at end of file
diff --git a/roles/npm/defaults/main.yml b/roles/npm/defaults/main.yml
new file mode 100644
index 0000000..90a960a
--- /dev/null
+++ b/roles/npm/defaults/main.yml
@@ -0,0 +1,4 @@
+npm_folder:
+ - data
+ - db
+ - letsencrypt
\ No newline at end of file
diff --git a/roles/npm/vars/main.yml.template b/roles/npm/vars/main.yml.template
deleted file mode 100644
index 36aa334..0000000
--- a/roles/npm/vars/main.yml.template
+++ /dev/null
@@ -1,11 +0,0 @@
-npm_folder:
- - data
- - db
- - letsencrypt
-
-NPM_MYSQL_HOST: 'nginx_proxy_manager_db'
-NPM_MYSQL_PORT: '3306'
-NPM_MYSQL_DB: npm
-NPM_MYSQL_USER: npm
-NPM_MYSQL_PASS: 'super-secret-pass'
-NPM_MYSQL_ROOT_PASS: 'super-secret-root-pass'
\ No newline at end of file
diff --git a/roles/vaultwarden/defaults/main.yml b/roles/vaultwarden/defaults/main.yml
new file mode 100644
index 0000000..286bf5e
--- /dev/null
+++ b/roles/vaultwarden/defaults/main.yml
@@ -0,0 +1,5 @@
+vaultwarden_folder:
+  - data
+
+VW_DISABLE_ADMIN_TOKEN: true
+VW_SIGNUPS_ALLOWED: false
\ No newline at end of file
diff --git a/roles/vaultwarden/vars/main.yml.template b/roles/vaultwarden/vars/main.yml.template
deleted file mode 100644
index 7bc621b..0000000
--- a/roles/vaultwarden/vars/main.yml.template
+++ /dev/null
@@ -1,6 +0,0 @@
-vaultwarden_folder:
-  - data
-
-VW_DISABLE_ADMIN_TOKEN: true
-VW_SIGNUPS_ALLOWED: false
-#VW_ADMIN_TOKEN: 'super-secret-admin-pass'
\ No newline at end of file
diff --git a/roles/wiki_js/defaults/main.yml b/roles/wiki_js/defaults/main.yml
new file mode 100644
index 0000000..fab35a9
--- /dev/null
+++ b/roles/wiki_js/defaults/main.yml
@@ -0,0 +1,2 @@
+wiki_js_folder:
+ - db
diff --git a/roles/wiki_js/vars/main.yml.template b/roles/wiki_js/vars/main.yml.template
deleted file mode 100644
index 01050d3..0000000
--- a/roles/wiki_js/vars/main.yml.template
+++ /dev/null
@@ -1,9 +0,0 @@
-wiki_js_folder:
- - db
-
-WIKI_JS_DB_TYPE: 'postgres'
-WIKI_JS_DB_HOST: 'wiki_js_db'
-WIKI_JS_DB_PORT: '5432'
-WIKI_JS_POSTGRES_DB: 'wiki'
-WIKI_JS_POSTGRES_USER: 'wiki'
-WIKI_JS_POSTGRES_PASS: 'super-secret-pass'
\ No newline at end of file