diff --git a/.etckeeper b/.etckeeper
index 8b685395..8eff6f97 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -906,6 +906,8 @@ maybe chmod 0444 'dhcp/.git/objects/63/3ef3cb79f7db54348d36e5661da6b6dffb8493'
 maybe chmod 0755 'dhcp/.git/objects/64'
 maybe chmod 0444 'dhcp/.git/objects/64/725b8ea3308e5afb418a429e522cc41609d303'
 maybe chmod 0444 'dhcp/.git/objects/64/8765aae0b2975ade75ca4a9320b98fec4562c6'
+maybe chmod 0755 'dhcp/.git/objects/69'
+maybe chmod 0444 'dhcp/.git/objects/69/829945f60d41514a2bc66de70556ea8f198a3c'
 maybe chmod 0755 'dhcp/.git/objects/70'
 maybe chmod 0444 'dhcp/.git/objects/70/bc8a1644ffa0ab0be9c0a8930bf6e3b3f9a5e8'
 maybe chmod 0755 'dhcp/.git/objects/79'
@@ -935,6 +937,7 @@ maybe chmod 0444 'dhcp/.git/objects/a7/dd06a259b75777e370dec7218f3b65e77c2dcd'
 maybe chmod 0755 'dhcp/.git/objects/a8'
 maybe chmod 0444 'dhcp/.git/objects/a8/4c4babbf237df4ef2838a1e8a18e90fb505070'
 maybe chmod 0755 'dhcp/.git/objects/a9'
+maybe chmod 0444 'dhcp/.git/objects/a9/b2953e07b742f8eab848337a2d3fb6e89b7f75'
 maybe chmod 0444 'dhcp/.git/objects/a9/eff0800f0c85706e4ae8a7472ce2e2d1db5c04'
 maybe chmod 0755 'dhcp/.git/objects/b0'
 maybe chmod 0444 'dhcp/.git/objects/b0/194cd648bd47c73e78ce5e89de83d57cb5c471'
@@ -953,6 +956,8 @@ maybe chmod 0755 'dhcp/.git/objects/bd'
 maybe chmod 0444 'dhcp/.git/objects/bd/cf39534491622160ee729e86cd0173efb45583'
 maybe chmod 0755 'dhcp/.git/objects/be'
 maybe chmod 0444 'dhcp/.git/objects/be/276a643c887ceda5b71abb029a87cd26017172'
+maybe chmod 0755 'dhcp/.git/objects/c7'
+maybe chmod 0444 'dhcp/.git/objects/c7/f2d321d6b2414bc35736bfc1d065729e21aace'
 maybe chmod 0755 'dhcp/.git/objects/cb'
 maybe chmod 0444 'dhcp/.git/objects/cb/ba403d644e2866c8b364fad5cb6c17afb2b124'
 maybe chmod 0755 'dhcp/.git/objects/ce'
diff --git a/cron.d/pihole b/cron.d/pihole
index 9271c783..1c6b5662 100644
--- a/cron.d/pihole
+++ b/cron.d/pihole
@@ -18,7 +18,7 @@
 #          early morning. Download any updates from the adlists
 #          Squash output to log, then splat the log to stdout on error to allow for
 #          standard crontab job error handling.
-6 3   * * 7   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updateGravity >/var/log/pihole_updateGravity.log || cat /var/log/pihole_updateGravity.log
+31 4   * * 7   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updateGravity >/var/log/pihole_updateGravity.log || cat /var/log/pihole_updateGravity.log
 
 # Pi-hole: Flush the log daily at 00:00
 #          The flush script will use logrotate if available
@@ -32,5 +32,5 @@
 */10 *  * * *   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker local
 
 # Pi-hole: Grab remote version every 24 hours
-47 12  * * *   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker remote
+19 19  * * *   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker remote
 @reboot root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker remote reboot
diff --git a/dhcp b/dhcp
index d8b87b7f..69829945 160000
--- a/dhcp
+++ b/dhcp
@@ -1 +1 @@
-Subproject commit d8b87b7f70d9bde5e7a39d161d8c72d43939cc70
+Subproject commit 69829945f60d41514a2bc66de70556ea8f198a3c
diff --git a/pihole/gravity.db b/pihole/gravity.db
index 9e742214..d3e31622 100644
Binary files a/pihole/gravity.db and b/pihole/gravity.db differ
diff --git a/pihole/localversions b/pihole/localversions
index c4b2b796..11fc83b3 100644
--- a/pihole/localversions
+++ b/pihole/localversions
@@ -1 +1 @@
-v5.3.1-0-g4736e03 v5.5-0-g7e602e0 v5.8
\ No newline at end of file
+v5.3.1-0-g4736e03 v5.5-0-g7e602e0 v5.8.1
\ No newline at end of file
diff --git a/pihole/macvendor.db b/pihole/macvendor.db
index 771cffbb..1b7c0dd4 100644
Binary files a/pihole/macvendor.db and b/pihole/macvendor.db differ
diff --git a/pihole/pihole-FTL.conf b/pihole/pihole-FTL.conf
index 21e5a5f3..ffefba68 100644
--- a/pihole/pihole-FTL.conf
+++ b/pihole/pihole-FTL.conf
@@ -1 +1,3 @@
 PRIVACYLEVEL=0
+MAXDBDAYS=30
+DBINTERVAL=10.0
diff --git a/pihole/setupVars.conf b/pihole/setupVars.conf
index a3248761..ac59e6f8 100644
--- a/pihole/setupVars.conf
+++ b/pihole/setupVars.conf
@@ -1,11 +1,13 @@
 WEBPASSWORD=db7ee491a7432b842ef6fb2d7dd2cad174b223b9496da3552873dfb5cffc60fa
 TEMPERATUREUNIT=F
+CONDITIONAL_FORWARDING=false
+HOSTRECORD=vpn.ovalwonder.com,10.3.14.92
+BLOCKING_ENABLED=true
 DNSMASQ_LISTENING=local
 DNS_FQDN_REQUIRED=true
 DNS_BOGUS_PRIV=false
 DNSSEC=false
-CONDITIONAL_FORWARDING=false
-HOSTRECORD=vpn.ovalwonder.com,10.3.14.92
+REV_SERVER=false
 PIHOLE_INTERFACE=eth0
 IPV4_ADDRESS=10.3.14.92/10
 IPV6_ADDRESS=
@@ -16,4 +18,3 @@ INSTALL_WEB_SERVER=false
 INSTALL_WEB_INTERFACE=true
 LIGHTTPD_ENABLED=false
 CACHE_SIZE=10000
-BLOCKING_ENABLED=true
diff --git a/pihole/setupVars.conf.update.bak b/pihole/setupVars.conf.update.bak
index 02c0753b..83ecf1e7 100644
--- a/pihole/setupVars.conf.update.bak
+++ b/pihole/setupVars.conf.update.bak
@@ -1,18 +1,20 @@
 WEBPASSWORD=db7ee491a7432b842ef6fb2d7dd2cad174b223b9496da3552873dfb5cffc60fa
 TEMPERATUREUNIT=F
-DNSMASQ_LISTENING=local
-DNS_FQDN_REQUIRED=true
-DNS_BOGUS_PRIV=false
-DNSSEC=false
 CONDITIONAL_FORWARDING=false
 HOSTRECORD=vpn.ovalwonder.com,10.3.14.92
 PIHOLE_INTERFACE=eth0
 IPV4_ADDRESS=10.3.14.92/10
 IPV6_ADDRESS=
-PIHOLE_DNS_1=127.0.0.1#53
-PIHOLE_DNS_2=127.0.0.1#53
 QUERY_LOGGING=true
 INSTALL_WEB_SERVER=false
 INSTALL_WEB_INTERFACE=true
 LIGHTTPD_ENABLED=false
+CACHE_SIZE=10000
 BLOCKING_ENABLED=true
+DNSMASQ_LISTENING=local
+PIHOLE_DNS_1=127.0.0.1#53
+PIHOLE_DNS_2=127.0.0.1#53
+DNS_FQDN_REQUIRED=true
+DNS_BOGUS_PRIV=false
+DNSSEC=false
+REV_SERVER=false