diff --git a/docker/build.py b/docker/build.py
index 54a279f845..c926b3653b 100755
--- a/docker/build.py
+++ b/docker/build.py
@@ -24,7 +24,7 @@ TYPE_LINT = 'lint'
 TYPES = [TYPE_DOCKER, TYPE_HA_ADDON, TYPE_LINT]
 
 
-BASE_VERSION = "3.6.0"
+BASE_VERSION = "4.2.0"
 
 
 parser = argparse.ArgumentParser()
diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index e94b59d3ae..443ed6a33a 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -4,9 +4,6 @@ import time
 from typing import Dict, Optional
 
 from zeroconf import (
-    _CLASS_IN,
-    _FLAGS_QR_QUERY,
-    _TYPE_A,
     DNSAddress,
     DNSOutgoing,
     DNSRecord,
@@ -15,6 +12,10 @@ from zeroconf import (
     Zeroconf,
 )
 
+_CLASS_IN = 1
+_FLAGS_QR_QUERY = 0x0000  # query
+_TYPE_A = 1
+
 
 class HostResolver(RecordUpdateListener):
     def __init__(self, name: str):
diff --git a/requirements.txt b/requirements.txt
index daaf86e641..2d354d5f04 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ tzlocal==2.1
 pytz==2021.1
 pyserial==3.5
 ifaddr==0.1.7
-platformio==5.1.1
+platformio==5.2.0
 esptool==3.1
 click==7.1.2
 esphome-dashboard==20210908.0