diff --git a/tinc-homeassistant/Dockerfile b/tinc-homeassistant/Dockerfile
deleted file mode 100644
index dbebe0c..0000000
--- a/tinc-homeassistant/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-ARG BUILD_FROM
-FROM $BUILD_FROM
-
-
-RUN /bin/sh -c set -xe && apk add -U tinc coreutils && rm -rf /var/cache/apk/*
-
-EXPOSE 655/tcp 655/udp
-
-WORKDIR /data
-
-COPY run.sh /
-COPY tinc-down /
-COPY tinc-up /
-RUN chmod a+x /run.sh
-RUN chmod a+x /tinc-up
-RUN chmod a+x /tinc-down
-RUN mkdir hosts
-RUN tincd -c . -K
-#ENTRYPOINT [ "tincd" ]
-
-CMD [ "/run.sh" ]
-#CMD [ "start" "-D" "-U" "nobody" ]
diff --git a/tinc-homeassistant/config.yaml b/tinc-homeassistant/config.yaml
deleted file mode 100644
index 4a9ef45..0000000
--- a/tinc-homeassistant/config.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: "Tinc VPN"
-description: "Addon to connect HASS via Tinc VPN"
-version: "1.0.0"
-slug: "hassio_tinc"
-arch:
-  - aarch64
-  - amd64
-  - armhf
-  - armv7
-  - i386
-ports:
-  655/tcp: 655
-  655/udp: 655
-options:
-  name: "hassio"
-schema:
-  name: str
-map:
-  - config:rw
\ No newline at end of file
diff --git a/tinc-homeassistant/run.sh b/tinc-homeassistant/run.sh
deleted file mode 100644
index 52f328c..0000000
--- a/tinc-homeassistant/run.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-ls -la /data
-
-curl -Lso /data/setup.sh https://gitea.jkoschke.me/Jan/hass-addon-repository/raw/branch/main/tinc-homeassistant/setup.sh \
-    && chmod a+x /data/setup.sh
-    
-/data/setup.sh
\ No newline at end of file
diff --git a/tinc-homeassistant/setup.sh b/tinc-homeassistant/setup.sh
deleted file mode 100644
index c6748f6..0000000
--- a/tinc-homeassistant/setup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-CONFIG_PATH=/data/options.json
-
-NAME="$(bashio::config 'name')"
-
-curl -Lso /data/tinc.config https://gitea.jkoschke.me/Jan/hass-addon-repository/raw/branch/main/tinc-homeassistant/tinc.config
-sed -i 's|{{NAME}}|'$NAME'|' /data/tinc.config
-
-cat /data/tinc.config
-
-ls /config
\ No newline at end of file
diff --git a/tinc-homeassistant/tinc-down b/tinc-homeassistant/tinc-down
deleted file mode 100644
index 3463ba7..0000000
--- a/tinc-homeassistant/tinc-down
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig $INTERFACE down
\ No newline at end of file
diff --git a/tinc-homeassistant/tinc-up b/tinc-homeassistant/tinc-up
deleted file mode 100644
index 70b73d6..0000000
--- a/tinc-homeassistant/tinc-up
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig $INTERFACE 10.0.0.1 netmask 255.255.255.0
\ No newline at end of file
diff --git a/tinc-homeassistant/tinc.conf b/tinc-homeassistant/tinc.conf
deleted file mode 100644
index b28d575..0000000
--- a/tinc-homeassistant/tinc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-Name = {{NAME}}
-AdressFamily = ipv4
-Interface = tun0
\ No newline at end of file
diff --git a/tinc/Dockerfile b/tinc/Dockerfile
index e209898..cbdca30 100644
--- a/tinc/Dockerfile
+++ b/tinc/Dockerfile
@@ -12,6 +12,7 @@ RUN \
         alsa-plugins-pulse \
         bluez \
         git \
+        tinc \
         libuv \
         mosquitto-clients \
         nano \