diff --git a/netbird2/Dockerfile b/netbird/Dockerfile
similarity index 100%
rename from netbird2/Dockerfile
rename to netbird/Dockerfile
diff --git a/netbird2/README.md b/netbird/README.md
similarity index 93%
rename from netbird2/README.md
rename to netbird/README.md
index 54da5011f..ec0c58190 100644
--- a/netbird2/README.md
+++ b/netbird/README.md
@@ -1,4 +1,4 @@
-# Home assistant add-on: NetBird Server 2
+# Home assistant add-on: NetBird Server
 
 I maintain this and other Home Assistant add-ons in my free time: keeping up with upstream changes, HA changes, and testing on real hardware takes a lot of time (and some money). I use around 5-10 of my >110 addons so regularly I install test machines (and purchase some test services such as vpn) that I don't use myself to troubleshoot and improve the addons.
 
@@ -9,9 +9,9 @@ If this add-on saves you time or makes your setup easier, I would be very gratef
 
 ## Addon information
 
-![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird2%2Fconfig.json)
-![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird2%2Fconfig.json)
-![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird2%2Fconfig.json)
+![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird%2Fconfig.json)
+![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird%2Fconfig.json)
+![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird%2Fconfig.json)
 
 [donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white
 [paypal-badge]: https://img.shields.io/badge/Donate%20via%20PayPal-0070BA?logo=paypal&style=flat&logoColor=white
@@ -92,8 +92,8 @@ The add-on uses s6 supervision; if any NetBird component exits, the supervisor r
 
 ```bash
 # From the repository root
-ha addons build netbird2
-ha addons install ./netbird2
+ha addons build netbird
+ha addons install ./netbird
 ```
 
 [repository]: https://github.com/alexbelgium/hassio-addons
diff --git a/netbird2/build.json b/netbird/build.json
similarity index 100%
rename from netbird2/build.json
rename to netbird/build.json
diff --git a/netbird2/config.json b/netbird/config.json
similarity index 97%
rename from netbird2/config.json
rename to netbird/config.json
index a2492e13e..4a3693804 100644
--- a/netbird2/config.json
+++ b/netbird/config.json
@@ -1,7 +1,7 @@
 {
-  "name": "NetBird Server 2",
-  "version": "0.1.1",
-  "slug": "netbird2",
+  "name": "NetBird Server",
+  "version": "0.1.2",
+  "slug": "netbird",
   "description": "Secure, WireGuard-based overlay network server (NetBird management + signal + optional dashboard).",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "arch": [
diff --git a/netbird2/rootfs/etc/cont-init.d/00-netbird-config.sh b/netbird/rootfs/etc/cont-init.d/00-netbird-config.sh
similarity index 100%
rename from netbird2/rootfs/etc/cont-init.d/00-netbird-config.sh
rename to netbird/rootfs/etc/cont-init.d/00-netbird-config.sh
diff --git a/netbird2/rootfs/etc/cont-init.d/01-dashboard-config.sh b/netbird/rootfs/etc/cont-init.d/01-dashboard-config.sh
similarity index 100%
rename from netbird2/rootfs/etc/cont-init.d/01-dashboard-config.sh
rename to netbird/rootfs/etc/cont-init.d/01-dashboard-config.sh
diff --git a/netbird2/rootfs/etc/services.d/netbird/finish b/netbird/rootfs/etc/services.d/netbird/finish
similarity index 100%
rename from netbird2/rootfs/etc/services.d/netbird/finish
rename to netbird/rootfs/etc/services.d/netbird/finish
diff --git a/netbird2/rootfs/etc/services.d/netbird/run b/netbird/rootfs/etc/services.d/netbird/run
similarity index 100%
rename from netbird2/rootfs/etc/services.d/netbird/run
rename to netbird/rootfs/etc/services.d/netbird/run
diff --git a/netbird2/rootfs/usr/share/netbird/management.json.tmpl b/netbird/rootfs/usr/share/netbird/management.json.tmpl
similarity index 100%
rename from netbird2/rootfs/usr/share/netbird/management.json.tmpl
rename to netbird/rootfs/usr/share/netbird/management.json.tmpl