diff --git a/tellstick/CHANGELOG.md b/tellstick/CHANGELOG.md
index 527317d..ca58089 100644
--- a/tellstick/CHANGELOG.md
+++ b/tellstick/CHANGELOG.md
@@ -1,16 +1,21 @@
 # Changelog
 
-## 2.0
+## 2.1.0
+
+- Update hardware configuration for Supervisor 2021.02.5
+- Use Alpine 3.13
+
+## 2.0.0
 
 - Rewrites add-on onto Bashio
 - Added documentation to the add-on repository
 - Code formatting
 
-## 1.0
+## 1.0.0
 
 - Update base image
 
-## 0.5
+## 0.5.0
 
 - Added possibility for config options:
   protocols: comen, fineoffset, mandolyn, oregon
diff --git a/tellstick/Dockerfile b/tellstick/Dockerfile
index 6266d78..ced11da 100644
--- a/tellstick/Dockerfile
+++ b/tellstick/Dockerfile
@@ -4,7 +4,10 @@ FROM $BUILD_FROM
 ENV LANG C.UTF-8
 
 # Install Telldus library for TellStick (using same approach as in hassio docker installation)
-RUN apk add --no-cache \
+ARG TELLDUS_COMMIT
+RUN \
+    set -x \
+    && apk add --no-cache \
         confuse \
         libftdi1 \
         libstdc++ \
@@ -21,8 +24,9 @@ RUN apk add --no-cache \
     && ln -s /usr/include/libftdi1/ftdi.h /usr/include/ftdi.h \
     && mkdir -p /usr/src \
     && cd /usr/src \
-    && git clone -b master --depth 1 https://github.com/telldus/telldus \
+    && git clone https://github.com/telldus/telldus \
     && cd telldus/telldus-core \
+    && git reset --hard ${TELLDUS_COMMIT} \
     && sed -i \
         "/\<sys\/socket.h\>/a \#include \<sys\/select.h\>" \
         common/Socket_unix.cpp \
diff --git a/tellstick/build.json b/tellstick/build.json
new file mode 100644
index 0000000..5d49c24
--- /dev/null
+++ b/tellstick/build.json
@@ -0,0 +1,12 @@
+{
+  "build_from": {
+    "aarch64": "homeassistant/aarch64-base:3.13",
+    "amd64": "homeassistant/amd64-base:3.13",
+    "armhf": "homeassistant/armhf-base:3.13",
+    "armv7": "homeassistant/armv7-base:3.13",
+    "i386": "homeassistant/i386-base:3.13"
+  },
+  "args": {
+    "TELLDUS_COMMIT": "2598bbed16ffd701f2a07c99582f057a3decbaf3"
+  }
+}
diff --git a/tellstick/config.json b/tellstick/config.json
index 9ab122f..1cdb736 100644
--- a/tellstick/config.json
+++ b/tellstick/config.json
@@ -1,14 +1,13 @@
 {
   "name": "TellStick",
-  "version": "2.0",
+  "version": "2.1.0",
   "slug": "tellstick",
   "description": "TellStick and TellStick Duo service",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/tellstick",
   "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "system",
   "stdin": true,
-  "boot": "auto",
-  "devices": ["/dev/bus/usb:/dev/bus/usb:rwm"],
+  "usb": true,
   "options": {
     "devices": [
       {