diff --git a/PKGBUILD b/PKGBUILD
index 7760bee..0b73eb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,22 +15,21 @@ source_armv6h=("https://releases.hashicorp.com/${pkgname}/${pkgver}/${pkgname}_$
 source_armv7h=("https://releases.hashicorp.com/${pkgname}/${pkgver}/${pkgname}_${pkgver}_linux_arm.zip")
 source=("https://raw.githubusercontent.com/hashicorp/${pkgname}/v${pkgver}/LICENSE"
 "consul.service"
-"consul.default"
 )
 
 sha256sums=('bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd'
-            '21d5198bc4d162e8f82f78c193efc4301e04855d678e7afab1b048ec3b85da3d'
-            '0cb108ddbfacdaa82eacf1952e6d8b2c4e03b2a8ab829329a05fe7c0e84eba7e')
+            'fe6c596c11d4dbce03249baf8892119f82dd7cc5b719b57ee3484d5e11b753b2')
 sha256sums_i686=('dbaf5ad1c95aa7dce1625d61b6686d3775e53cb3e7d6c426d29ea96622d248a8')
 sha256sums_x86_64=('abdf0e1856292468e2c9971420d73b805e93888e006c76324ae39416edcf0627')
 sha256sums_armv6h=('81200fc8b7965dfc6048c336925211eaf2c7247be5d050946a5dd4d53ec9817e')
 sha256sums_armv7h=('81200fc8b7965dfc6048c336925211eaf2c7247be5d050946a5dd4d53ec9817e')
 
-
 package() {
-    install -m644 -D "${srcdir}/consul.default" "${pkgdir}/etc/default/consul"
 
     mkdir -p "${pkgdir}/etc/consul.d"
+    mkdir -p "${pkgdir}/var/lib/consul"
+
+    chown -R nobody.nobody "${pkgdir}/var/lib/consul"
 
     install -m644 -D "${srcdir}/consul.service" "${pkgdir}/usr/lib/systemd/system/consul.service"
 
diff --git a/consul.default b/consul.default
deleted file mode 100644
index c35afbf..0000000
--- a/consul.default
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFDIR=/etc/consul.d
-DATADIR=/var/lib/consul
-GOMAXPROCS=4
-OPTIONS=""
diff --git a/consul.service b/consul.service
index 44165ce..bf5f324 100644
--- a/consul.service
+++ b/consul.service
@@ -6,10 +6,9 @@ After=network-online.target
 [Service]
 User=nobody
 Group=nobody 
-EnvironmentFile=-/etc/default/consul
 Environment=GOMAXPROCS=4
 Restart=on-failure
-ExecStart=/usr/bin/consul agent $OPTIONS -config-dir="$CONFDIR" -data-dir="$DATADIR"
+ExecStart=/usr/bin/consul agent -config-dir=/etc/consul.d -data-dir=/var/lib/consul
 ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGINT
 KillMode=process