diff --git a/config_allfeatures.cmake b/config_allfeatures.cmake
index c622fd7..16ce90b 100644
--- a/config_allfeatures.cmake
+++ b/config_allfeatures.cmake
@@ -73,6 +73,5 @@ set(BOBBYCAR_BUILDFLAGS
   -DPINS_LEDSTRIP=33
   -DHEAP_LRGST_CRASH_TEXT_FIX
   -DLEDSTRIP_WRONG_DIRECTION
-  -DFEATURE_DNS_NS
   -DFEATURE_ESPNOW
 )
diff --git a/config_comred.cmake b/config_comred.cmake
index c32e107..3e05c3f 100644
--- a/config_comred.cmake
+++ b/config_comred.cmake
@@ -66,7 +66,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DPINS_LEDSTRIP=33
   -DHEAP_LRGST_CRASH_TEXT_FIX
 #  -DLEDSTRIP_WRONG_DIRECTION
-  -DFEATURE_DNS_NS
   -DFEATURE_ESPNOW
 )
 
diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake
index edc2d73..f45e845 100644
--- a/config_feedc0de.cmake
+++ b/config_feedc0de.cmake
@@ -64,6 +64,5 @@ set(BOBBYCAR_BUILDFLAGS
   -DPINS_LEDSTRIP=26
 #  -DHEAP_LRGST_CRASH_TEXT_FIX
 #  -DLEDSTRIP_WRONG_DIRECTION
-  -DFEATURE_DNS_NS
 #  -DFEATURE_ESPNOW
 )
diff --git a/config_greyhash.cmake b/config_greyhash.cmake
index 8afda6c..6dd41f0 100644
--- a/config_greyhash.cmake
+++ b/config_greyhash.cmake
@@ -67,6 +67,7 @@ set(BOBBYCAR_BUILDFLAGS
 #   -DPINS_LEDSTRIP=33
 #   -DLEDSTRIP_DEFAULT_BRIGHTNESS=100
 #  -DLEDSTRIP_WRONG_DIRECTION
+<<<<<<< HEAD
   -DLEDSTRIP_ANIMATION_DEFAULT=2
   -DLEDS_PER_METER=144
   -DOLD_NVS
@@ -74,6 +75,8 @@ set(BOBBYCAR_BUILDFLAGS
 #  -DSWITCH_BLINK
 #  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
   -DFEATURE_ESPNOW
+=======
+>>>>>>> 99526a5 (Moved FEATURE_DNS_NS into config-system)
 )
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
diff --git a/config_mick.cmake b/config_mick.cmake
index 8944f99..2e71d79 100644
--- a/config_mick.cmake
+++ b/config_mick.cmake
@@ -63,8 +63,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DFEATURE_WIRELESS_CONFIG
   -DPINS_LEDSTRIP=33
 #  -DLEDSTRIP_WRONG_DIRECTION
-  -DFEATURE_DNS_NS
-  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
 )
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
diff --git a/config_nofeatures.cmake b/config_nofeatures.cmake
index 5e1391a..b47a2c3 100644
--- a/config_nofeatures.cmake
+++ b/config_nofeatures.cmake
@@ -73,6 +73,5 @@ set(BOBBYCAR_BUILDFLAGS
    -DPINS_LEDSTRIP=33
 #  -DHEAP_LRGST_CRASH_TEXT_FIX
 #  -DLEDSTRIP_WRONG_DIRECTION
-#  -DFEATURE_DNS_NS
 #  -DFEATURE_ESPNOW
 )
diff --git a/config_peter.cmake b/config_peter.cmake
index bcf7b6d..2236fa0 100644
--- a/config_peter.cmake
+++ b/config_peter.cmake
@@ -64,7 +64,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DPINS_LEDSTRIP=33
 #  -DHEAP_LRGST_CRASH_TEXT_FIX
 #  -DLEDSTRIP_WRONG_DIRECTION
-  -DFEATURE_DNS_NS
   -DFEATURE_ESPNOW
 )
 
diff --git a/main/dnsannounce.cpp b/main/dnsannounce.cpp
index db9bb4a..357998d 100644
--- a/main/dnsannounce.cpp
+++ b/main/dnsannounce.cpp
@@ -1,14 +1,16 @@
-// 3rd party
-#ifdef FEATURE_DNS_NS
+#include "dnsannounce.h"
+
+// system includes
+#include "lwip/dns.h"
+
+// 3rdparty includes
+#include <cpputils.h>
 #include <randomutils.h>
 #include <esprandom.h>
+#include <espwifistack.h>
 #include <FastLED.h>
 
-// local
-#include "dnsannounce.h"
-#include "espwifistack.h"
-#include "cpputils.h"
-#include "lwip/dns.h"
+// local includes
 #include "globals.h"
 #include "newsettings.h"
 
@@ -22,7 +24,7 @@ void init_dns_announce()
 
 void handle_dns_announce()
 {
-    if (!configs.dns_announce_enabled.value)
+    if (!configs.feature.dnsannounce.value || !configs.dns_announce_enabled.value)
         return;
 
     if (wifi_stack::get_sta_status() != wifi_stack::WiFiStaStatus::CONNECTED)
diff --git a/main/dnsannounce.h b/main/dnsannounce.h
index 96c5ea7..cbc26f4 100644
--- a/main/dnsannounce.h
+++ b/main/dnsannounce.h
@@ -3,11 +3,9 @@
 // system includes
 #include <string>
 
-#ifdef FEATURE_DNS_NS
 extern std::string dns_lastIpAddress_v4;
 extern std::string dns_lastIpAddress_v6;
 extern std::string dns_lastIpAddress_v6_global;
 
 void init_dns_announce();
 void handle_dns_announce();
-#endif
diff --git a/main/newsettings.h b/main/newsettings.h
index 7d452ba..9c0359b 100644
--- a/main/newsettings.h
+++ b/main/newsettings.h
@@ -311,6 +311,7 @@ public:
         ConfigWrapper<bool> garage                {false,                                  DoReset,   {},                         "f_garage"            };
         ConfigWrapper<bool> cloud                 {false,                                  DoReset,   {},                         "f_cloud"             };
         ConfigWrapper<bool> udpcloud              {false,                                  DoReset,   {},                         "f_udpcloud"          };
+        ConfigWrapper<bool> dnsannounce           {false,                                  DoReset,   {},                         "f_dnsannounce"       };
         ConfigWrapper<bool> gschissene_diode      {false,                                  DoReset,   {},                         "f_gschissDiode"      };
     } feature;
 
@@ -608,7 +609,8 @@ public:
     x(feature.webserver_disable_lock) \
     x(feature.garage) \
     x(feature.udpcloud) \
-    x(feature.cloud)
+    x(feature.cloud) \
+    x(feature.dnsannounce)
     //x(bleSettings.bleEnabled)
 
 #define FEATURES(x) \
@@ -616,7 +618,8 @@ public:
     x(feature.webserver_disable_lock) \
     x(feature.garage) \
     x(feature.udpcloud) \
-    x(feature.cloud)
+    x(feature.cloud) \
+    x(feature.dnsannounce)
     //x(feature.gschisseneDiode)
 
     template<typename T>
diff --git a/main/taskmanager.cpp b/main/taskmanager.cpp
index c75d4cc..8325a94 100644
--- a/main/taskmanager.cpp
+++ b/main/taskmanager.cpp
@@ -64,9 +64,7 @@
 #include "udpcloud.h"
 #include "modes.h"
 #include "drivingstatistics.h"
-#ifdef FEATURE_DNS_NS
 #include "dnsannounce.h"
-#endif
 #include "screens.h"
 
 using namespace std::chrono_literals;
@@ -133,9 +131,7 @@ BobbySchedulerTask schedulerTasksArr[] {
     BobbySchedulerTask { "udpcloud",       udpCloudInit,          udpCloudUpdate,          50ms },
     BobbySchedulerTask { "drivingmode",    initDrivingMode,       updateDrivingMode,       20ms },
     BobbySchedulerTask { "drivingstatistics", initStatistics,     calculateStatistics,     100ms },
-#ifdef FEATURE_DNS_NS
     BobbySchedulerTask { "dnsannounce",    init_dns_announce,     handle_dns_announce,     100ms },
-#endif
     BobbySchedulerTask { "updateDisp",     not_needed,            updateDisplay,           20ms },
     BobbySchedulerTask { "redrawDisp",     not_needed,            redrawDisplay,           20ms },
 };