diff --git a/examples/custom_outbox/CMakeLists.txt b/examples/custom_outbox/CMakeLists.txt
index 746ab1c..137506b 100644
--- a/examples/custom_outbox/CMakeLists.txt
+++ b/examples/custom_outbox/CMakeLists.txt
@@ -17,4 +17,4 @@ target_sources(${mqtt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/main/custom_outbox.cp
 # First we get our dependency
 idf_component_get_property(pthread pthread COMPONENT_LIB)
 # And them we link the components
-target_link_libraries(${mqtt} ${pthread})
+target_link_libraries(${mqtt} PRIVATE ${pthread})
diff --git a/examples/custom_outbox/main/Kconfig.projbuild b/examples/custom_outbox/main/Kconfig.projbuild
index c11539f..037367e 100644
--- a/examples/custom_outbox/main/Kconfig.projbuild
+++ b/examples/custom_outbox/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config BROKER_URL
         string "Broker URL"
-        default "mqtt://mqtt.eclipseprojects.io"
+        default "mqtt://test.mosquitto.org"
         help
             URL of the broker to connect to
 
diff --git a/examples/mqtt5/main/Kconfig.projbuild b/examples/mqtt5/main/Kconfig.projbuild
index c11539f..037367e 100644
--- a/examples/mqtt5/main/Kconfig.projbuild
+++ b/examples/mqtt5/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config BROKER_URL
         string "Broker URL"
-        default "mqtt://mqtt.eclipseprojects.io"
+        default "mqtt://test.mosquitto.org"
         help
             URL of the broker to connect to
 
diff --git a/examples/ssl/main/Kconfig.projbuild b/examples/ssl/main/Kconfig.projbuild
index 5e9357d..5a169a4 100644
--- a/examples/ssl/main/Kconfig.projbuild
+++ b/examples/ssl/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config BROKER_URI
         string "Broker URL"
-        default "mqtts://mqtt.eclipseprojects.io:8883"
+        default "mqtts://test.mosquitto.org:8883"
         help
             URL of an mqtt broker which this example connects to.
 
diff --git a/examples/tcp/main/Kconfig.projbuild b/examples/tcp/main/Kconfig.projbuild
index c11539f..037367e 100644
--- a/examples/tcp/main/Kconfig.projbuild
+++ b/examples/tcp/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config BROKER_URL
         string "Broker URL"
-        default "mqtt://mqtt.eclipseprojects.io"
+        default "mqtt://test.mosquitto.org"
         help
             URL of the broker to connect to
 
diff --git a/examples/ws/main/Kconfig.projbuild b/examples/ws/main/Kconfig.projbuild
index e547a51..0fb37be 100644
--- a/examples/ws/main/Kconfig.projbuild
+++ b/examples/ws/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config BROKER_URI
         string "Broker URL"
-        default "ws://mqtt.eclipseprojects.io:80/mqtt"
+        default "ws://test.mosquitto.org:80/mqtt"
         help
             URL of an mqtt broker which this example connects to.
 
diff --git a/examples/wss/main/Kconfig.projbuild b/examples/wss/main/Kconfig.projbuild
index b6d1f59..f7de59a 100644
--- a/examples/wss/main/Kconfig.projbuild
+++ b/examples/wss/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     config BROKER_URI
         string "Broker URL"
-        default "wss://mqtt.eclipseprojects.io:443/mqtt"
+        default "wss://test.mosquitto.org:443/mqtt"
         help
             URL of an mqtt broker which this example connects to.
 
diff --git a/test/apps/mqtt/main/Kconfig.projbuild b/test/apps/mqtt/main/Kconfig.projbuild
index 30b2c10..ab18691 100644
--- a/test/apps/mqtt/main/Kconfig.projbuild
+++ b/test/apps/mqtt/main/Kconfig.projbuild
@@ -2,13 +2,13 @@ menu "ESP-MQTT Unit Test Config"
 
     config MQTT_TEST_BROKER_URI
         string "URI of the test broker"
-        default "mqtt://mqtt.eclipseprojects.io"
+        default "mqtt://test.mosquitto.org"
         help
             URL of an mqtt broker which this test connects to.
 
     config MQTT5_TEST_BROKER_URI
         string "URI of the test broker"
-        default "mqtt://mqtt.eclipseprojects.io"
+        default "mqtt://test.mosquitto.org"
         help
             URL of an mqtt broker which this test connects to.
 endmenu
diff --git a/test/apps/mqtt5/main/Kconfig.projbuild b/test/apps/mqtt5/main/Kconfig.projbuild
index 30b2c10..ab18691 100644
--- a/test/apps/mqtt5/main/Kconfig.projbuild
+++ b/test/apps/mqtt5/main/Kconfig.projbuild
@@ -2,13 +2,13 @@ menu "ESP-MQTT Unit Test Config"
 
     config MQTT_TEST_BROKER_URI
         string "URI of the test broker"
-        default "mqtt://mqtt.eclipseprojects.io"
+        default "mqtt://test.mosquitto.org"
         help
             URL of an mqtt broker which this test connects to.
 
     config MQTT5_TEST_BROKER_URI
         string "URI of the test broker"
-        default "mqtt://mqtt.eclipseprojects.io"
+        default "mqtt://test.mosquitto.org"
         help
             URL of an mqtt broker which this test connects to.
 endmenu
diff --git a/test/apps/publish_connect_test/main/Kconfig.projbuild b/test/apps/publish_connect_test/main/Kconfig.projbuild
index dce9ce2..e94ed9a 100644
--- a/test/apps/publish_connect_test/main/Kconfig.projbuild
+++ b/test/apps/publish_connect_test/main/Kconfig.projbuild
@@ -2,25 +2,25 @@ menu "Example Configuration"
 
     config EXAMPLE_BROKER_SSL_URI
         string "Broker SSL URL"
-        default "mqtts://mqtt.eclipseprojects.io:8883"
+        default "mqtts://test.mosquitto.org:8883"
         help
             URL of an mqtt broker for ssl transport
 
     config EXAMPLE_BROKER_TCP_URI
         string "Broker TCP URL"
-        default "mqtt://mqtt.eclipseprojects.io:1883"
+        default "mqtt://test.mosquitto.org:1883"
         help
             URL of an mqtt broker for tcp transport
 
     config EXAMPLE_BROKER_WS_URI
         string "Broker WS URL"
-        default "ws://mqtt.eclipseprojects.io:80/mqtt"
+        default "ws://test.mosquitto.org:80/mqtt"
         help
             URL of an mqtt broker for ws transport
 
     config EXAMPLE_BROKER_WSS_URI
         string "Broker WSS URL"
-        default "wss://mqtt.eclipseprojects.io:443/mqtt"
+        default "wss://test.mosquitto.org:443/mqtt"
         help
             URL of an mqtt broker for wss transport