diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 451feda9..89678859 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -67,9 +67,6 @@
   template:
     src: docker-compose.yaml.j2
     dest: /opt/docker/watchtower/docker-compose.yaml
-    #owner: 1000
-    #group: 1000
-    #mode: '0755'
   notify: restart docker-compose
   tags: setup,update
 
diff --git a/roles/mediaserver/templates/docker-compose.yaml.j2 b/roles/mediaserver/templates/docker-compose.yaml.j2
index 3eeb1f46..a92ad560 100644
--- a/roles/mediaserver/templates/docker-compose.yaml.j2
+++ b/roles/mediaserver/templates/docker-compose.yaml.j2
@@ -49,8 +49,8 @@ services:
             - '/etc/localtime:/etc/localtime:ro'
         environment:
             - VPN_ENABLED=yes
-            - VPN_USER=p3754227
-            - VPN_PASS=xsZtFdAofY
+            - VPN_USER={{ VPN_USER }}
+            - VPN_PASS={{ VPN_PASS }}
             - VPN_PROV=pia
             - VPN_CLIENT=openvpn
             - STRICT_PORT_FORWARD=yes
diff --git a/roles/mediaserver/vars/main.yml b/roles/mediaserver/vars/main.yml
index a90f5468..ae92a5b6 100644
--- a/roles/mediaserver/vars/main.yml
+++ b/roles/mediaserver/vars/main.yml
@@ -1,26 +1,2 @@
-$ANSIBLE_VAULT;1.1;AES256
-35633363316132666635656236316665663235336530323065396632636536386135616264373863
-3932373362336332396330653661626432346164623537390a656565633461373731366236313234
-62363136363133353737386562396330326662326135363533343864323931326139376230373262
-6462323031343330360a613635306539626136666235656437303036303430366564326437303038
-35363830343362643030346565336264346139306161646332363436306462336362303362623465
-37303339653339323531613230613635353066386432383561633362653638636365303137306136
-37396239626635363830613130376265386339643466623437653734353035646332356464386136
-66666135663233383234333237346164386134303466646661356539376663656133323531643337
-33363563343138366563396362636465616631366635353639666131353030613338336162303261
-61303264616236346165333033383763353030326361666530636636353963663266346633663664
-36656662333363646664316263346538356631366565363662633937393539626535356530303732
-38666430656635393338613334353562326631326663613339653034626233663966333636363438
-65616464646463336666306263636437343231613765646637303264303632303831303434373161
-62326135646532653133393063663434633834346239316261313831333630306661643035666231
-38623239333437363231323465343633303833313438396562663162373764636662356234336638
-62343065393831613739386532386635613430626239653432666434323939393562313462336364
-35323164376662333239333666383134336539396434393263396137346639373630373839613436
-62653933396239653965306432653837326235356365366563393963633133613261386235663363
-31613463393539643536323866633763353436343238646135636634653834366266333235656230
-32373665656235643234306335613338343465363133626233353232653836323137643937636336
-35613339636662363837333135626336396437356230303464373834643865636438356664346235
-39623036653034663833623737326166373938313731336265626637383538616663396231306430
-34356534613833616139386230313336376532353834343162386139363236666266326638623061
-65643536346439666437643065353264643633653664623462616639653630323735383932626137
-3363
+VPN_USER:"p3754227"
+VPN_PASS:"xsZtFdAofY"