diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 02a586a..843f997 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,15 +1,11 @@
+FROM roxedus/playground:hass-base as base
 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12 as buildstage
 
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG HASS_RELEASE
-ARG HACS_RELEASE
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="saarg"
+COPY --from=base /tmp /
+
 
 # environment settings
-ENV HOME="/tmp"
+ENV HOME="/tmp" PIPFLAGS="--find-links=/tmp/wheels --no-cache-dir --use-deprecated=legacy-resolver"
 
 # install packages
 # https://github.com/home-assistant/core/blob/11d74124cd06f48c1faf68df9a2ab9034130fafa/azure-pipelines-wheels.yml#L32
@@ -52,22 +48,6 @@ RUN \
     unzip
 
 RUN \
- echo "**** find packages to build for homeassistant ****" && \
- mkdir -p \
-    /tmp/core && \
- if [ -z ${HASS_RELEASE+x} ]; then \
-    HASS_RELEASE=$(curl -sX GET https://api.github.com/repos/home-assistant/core/releases/latest \
-    | jq -r .tag_name); \
- fi && \
- curl -o \
- /tmp/core.tar.gz -L \
-        "https://github.com/home-assistant/core/archive/${HASS_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/core.tar.gz -C \
-        /tmp/core --strip-components=1
-
-RUN \
- echo "**** make folders for building wheels and upgrade pip ****" && \
  mkdir -p \
         /build/addons \
         /build/core && \
@@ -76,36 +56,18 @@ RUN \
 
 RUN \
  echo "**** build wheels for home assistant core ****" && \
- awk '/# Home Assistant Core/,/^$/' /tmp/core/requirements_all.txt > /tmp/requirements_hass.txt && \
- awk '/# homeassistant.components.trend/,/^$/' /tmp/core/requirements_all.txt >> /tmp/requirements_hass.txt && \
- sed -i "s/-r requirements.txt/-r \/tmp\/core\/requirements.txt/g" /tmp/requirements_hass.txt && \
- pip3 wheel --wheel-dir=/build/core --no-cache-dir --use-deprecated=legacy-resolver \
+ pip3 wheel --wheel-dir=/build/core $PIPFLAGS \
         -r /tmp/requirements_hass.txt
 
 # https://github.com/home-assistant/core/issues/43934 >> https://github.com/home-assistant/core/pull/36330
 RUN \
  echo "**** build wheels for home assistant addons ****" && \
- sed -i "s/-r requirements_test.txt/-r \/tmp\/core\/requirements_test.txt/g" /tmp/core/requirements_test_all.txt && \
- sed -i "s/-r requirements_test_pre_commit.txt/-r \/tmp\/core\/requirements_test_pre_commit.txt/g" /tmp/core/requirements_test.txt && \
- pip3 wheel --wheel-dir /build/addons --no-cache-dir --find-links=/build/core --use-deprecated=legacy-resolver \
+ pip3 wheel --wheel-dir=/build/addons $PIPFLAGS \
         -r /tmp/core/requirements_test_all.txt
 
 RUN \
  echo "**** install dependencies for hacs.xyz ****" && \
- if [ -z ${HACS_RELEASE+x} ]; then \
-    HACS_RELEASE=$(curl -sX GET "https://api.github.com/repos/hacs/integration/releases/latest" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- mkdir -p \
-        /build/hacs \
-        /tmp/hacs-source && \
- curl -o \
-    /tmp/hacs.tar.gz -L \
-    "https://github.com/hacs/integration/archive/${HACS_RELEASE}.tar.gz" && \
- tar xf \
-    /tmp/hacs.tar.gz -C \
-    /tmp/hacs-source --strip-components=1 && \
- pip3 wheel --wheel-dir=/build/hacs --no-cache-dir --find-links=/build/core --find-links=/build/addons --use-deprecated=legacy-resolver \
+ pip3 wheel --wheel-dir=/build/hacs $PIPFLAGS \
     -r /tmp/hacs-source/requirements.txt
 
 RUN \
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
new file mode 100644
index 0000000..c03042f
--- /dev/null
+++ b/Dockerfile.amd64
@@ -0,0 +1,82 @@
+FROM roxedus/playground:hass-base as base
+FROM ghcr.io/linuxserver/baseimage-alpine:amd64-3.12 as buildstage
+
+COPY --from=base /tmp /tmp
+
+
+# environment settings
+ENV HOME="/tmp" PIPFLAGS="--find-links=/tmp/wheels --no-cache-dir --use-deprecated=legacy-resolver"
+
+# install packages
+# https://github.com/home-assistant/core/blob/11d74124cd06f48c1faf68df9a2ab9034130fafa/azure-pipelines-wheels.yml#L32
+RUN \
+ echo "**** install build packages ****" && \
+ apk add --no-cache --virtual=build-dependencies \
+    autoconf \
+    bluez-deprecated \
+    bluez-dev \
+    build-base \
+    ca-certificates \
+    cmake \
+    curl \
+    cython \
+    eudev-dev \
+    eudev-libs \
+    ffmpeg \
+    ffmpeg-dev \
+    g++ \
+    gcc \
+    git \
+    glib-dev \
+    jq \
+    libffi-dev \
+    libjpeg-turbo \
+    libjpeg-turbo-dev \
+    libstdc++ \
+    libxml2-dev \
+    libxslt \
+    libxslt-dev \
+    linux-headers \
+    make \
+    openssl \
+    openssl-dev \
+    py3-pip \
+    py3-wheel \
+    python3 \
+    python3-dev \
+    sudo \
+    unzip
+
+RUN \
+ mkdir -p \
+        /build/addons \
+        /build/core && \
+ pip3 install --no-cache-dir --upgrade \
+        pip==20.3 # https://github.com/home-assistant/core/pull/43771
+
+RUN \
+ echo "**** build wheels for home assistant core ****" && \
+ pip3 wheel --wheel-dir=/build/core $PIPFLAGS \
+        -r /tmp/requirements_hass.txt
+
+# https://github.com/home-assistant/core/issues/43934 >> https://github.com/home-assistant/core/pull/36330
+RUN \
+ echo "**** build wheels for home assistant addons ****" && \
+ pip3 wheel --wheel-dir=/build/addons $PIPFLAGS \
+        -r /tmp/core/requirements_test_all.txt
+
+RUN \
+ echo "**** install dependencies for hacs.xyz ****" && \
+ pip3 wheel --wheel-dir=/build/hacs $PIPFLAGS \
+    -r /tmp/hacs-source/requirements.txt
+
+RUN \
+ mkdir -p \
+    /tmp/repo && \
+ mv /build/addons/* /tmp/repo/ && \
+ mv /build/core/* /tmp/repo/ && \
+ mv /build/hacs/* /tmp/repo/
+
+FROM scratch
+
+COPY --from=buildstage /tmp/repo /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index b2d6588..18b3995 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,15 +1,11 @@
+FROM roxedus/playground:hass-base as base
 FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 as buildstage
 
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG HASS_RELEASE
-ARG HACS_RELEASE
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="saarg"
+COPY --from=base /tmp /
+
 
 # environment settings
-ENV HOME="/tmp"
+ENV HOME="/tmp" PIPFLAGS="--find-links=/tmp/wheels --no-cache-dir --use-deprecated=legacy-resolver"
 
 # install packages
 # https://github.com/home-assistant/core/blob/11d74124cd06f48c1faf68df9a2ab9034130fafa/azure-pipelines-wheels.yml#L32
@@ -52,22 +48,6 @@ RUN \
     unzip
 
 RUN \
- echo "**** find packages to build for homeassistant ****" && \
- mkdir -p \
-    /tmp/core && \
- if [ -z ${HASS_RELEASE+x} ]; then \
-    HASS_RELEASE=$(curl -sX GET https://api.github.com/repos/home-assistant/core/releases/latest \
-    | jq -r .tag_name); \
- fi && \
- curl -o \
- /tmp/core.tar.gz -L \
-        "https://github.com/home-assistant/core/archive/${HASS_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/core.tar.gz -C \
-        /tmp/core --strip-components=1
-
-RUN \
- echo "**** make folders for building wheels and upgrade pip ****" && \
  mkdir -p \
         /build/addons \
         /build/core && \
@@ -76,36 +56,18 @@ RUN \
 
 RUN \
  echo "**** build wheels for home assistant core ****" && \
- awk '/# Home Assistant Core/,/^$/' /tmp/core/requirements_all.txt > /tmp/requirements_hass.txt && \
- awk '/# homeassistant.components.trend/,/^$/' /tmp/core/requirements_all.txt >> /tmp/requirements_hass.txt && \
- sed -i "s/-r requirements.txt/-r \/tmp\/core\/requirements.txt/g" /tmp/requirements_hass.txt && \
- pip3 wheel --wheel-dir=/build/core --no-cache-dir --use-deprecated=legacy-resolver \
+ pip3 wheel --wheel-dir=/build/core $PIPFLAGS \
         -r /tmp/requirements_hass.txt
 
 # https://github.com/home-assistant/core/issues/43934 >> https://github.com/home-assistant/core/pull/36330
 RUN \
  echo "**** build wheels for home assistant addons ****" && \
- sed -i "s/-r requirements_test.txt/-r \/tmp\/core\/requirements_test.txt/g" /tmp/core/requirements_test_all.txt && \
- sed -i "s/-r requirements_test_pre_commit.txt/-r \/tmp\/core\/requirements_test_pre_commit.txt/g" /tmp/core/requirements_test.txt && \
- pip3 wheel --wheel-dir /build/addons --no-cache-dir --find-links=/build/core --use-deprecated=legacy-resolver \
+ pip3 wheel --wheel-dir=/build/addons $PIPFLAGS \
         -r /tmp/core/requirements_test_all.txt
 
 RUN \
  echo "**** install dependencies for hacs.xyz ****" && \
- if [ -z ${HACS_RELEASE+x} ]; then \
-    HACS_RELEASE=$(curl -sX GET "https://api.github.com/repos/hacs/integration/releases/latest" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- mkdir -p \
-        /build/hacs \
-        /tmp/hacs-source && \
- curl -o \
-    /tmp/hacs.tar.gz -L \
-    "https://github.com/hacs/integration/archive/${HACS_RELEASE}.tar.gz" && \
- tar xf \
-    /tmp/hacs.tar.gz -C \
-    /tmp/hacs-source --strip-components=1 && \
- pip3 wheel --wheel-dir=/build/hacs --no-cache-dir --find-links=/build/core --find-links=/build/addons --use-deprecated=legacy-resolver \
+ pip3 wheel --wheel-dir=/build/hacs $PIPFLAGS \
     -r /tmp/hacs-source/requirements.txt
 
 RUN \
diff --git a/Dockerfile b/Dockerfile.base
similarity index 94%
rename from Dockerfile
rename to Dockerfile.base
index e971ed5..1c12262 100644
--- a/Dockerfile
+++ b/Dockerfile.base
@@ -110,11 +110,12 @@ RUN \
 
 RUN \
  mkdir -p \
-    /tmp/repo && \
- mv /build/addons/* /tmp/repo/ && \
- mv /build/core/* /tmp/repo/ && \
- mv /build/hacs/* /tmp/repo/
+    /tmp/wheels && \
+ rm -rf /tmp/.cache /tmp/*.tar.gz && \
+ mv /build/addons/* /tmp/wheels/ && \
+ mv /build/core/* /tmp/wheels/ && \
+ mv /build/hacs/* /tmp/wheels/
 
 FROM scratch
 
-COPY --from=buildstage /tmp/repo /
+COPY --from=buildstage /tmp /tmp