diff --git a/cec_scan/CHANGELOG.md b/cec_scan/CHANGELOG.md
index 48e2f0b..88be367 100644
--- a/cec_scan/CHANGELOG.md
+++ b/cec_scan/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2
+- Use new native Alpine RPi library for 64bit
+
 ## 1
 - Add support for Raspberry-pi 64bit
 - Update libCEC to 4.0.3
diff --git a/cec_scan/Dockerfile b/cec_scan/Dockerfile
index 8684ac0..e04be62 100644
--- a/cec_scan/Dockerfile
+++ b/cec_scan/Dockerfile
@@ -9,21 +9,8 @@ ARG BUILD_ARCH
 
 ##
 # RPi support for HDMI-CEC on armhf/aarch64
-RUN if [ "$BUILD_ARCH" == "armhf" ]; then \
+RUN if [ "$BUILD_ARCH" == "armhf" ] || [ "$BUILD_ARCH" == "aarch64" ]; then \
         apk add --no-cache raspberrypi-dev raspberrypi-libs; \
-    elif [ "$BUILD_ARCH" == "aarch64" ]; then \
-        apk add --no-cache --virtual .build-dependencies \
-            cmake make g++ git linux-headers \
-        && git clone --depth 1 https://github.com/raspberrypi/userland /usr/src/userland \
-        && mkdir -p /usr/src/userland/build \
-        && cd /usr/src/userland/build \
-        && cmake \
-            -DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE -Wno-error=array-bounds" \
-            -DCMAKE_BUILD_TYPE=Release -DARM64=True -DCMAKE_INSTALL_RPATH=/opt/vc/lib .. \
-        && make -j$(nproc) \
-        && make install \
-        && apk del .build-dependencies \
-        && rm -rf /usr/src/userland; \
     fi
 
 ##
diff --git a/cec_scan/config.json b/cec_scan/config.json
index 19ea09f..acf8ad1 100644
--- a/cec_scan/config.json
+++ b/cec_scan/config.json
@@ -1,6 +1,6 @@
 {
   "name": "CEC Scanner",
-  "version": "1",
+  "version": "2",
   "slug": "cec_scan",
   "description": "Scan HDMI CEC devices",
   "url": "https://home-assistant.io/addons/cec_scan/",