diff --git a/samples/common/runtime_psk.conf b/samples/common/runtime_settings.conf
similarity index 87%
rename from samples/common/runtime_psk.conf
rename to samples/common/runtime_settings.conf
index a31da63e..9f77563f 100644
--- a/samples/common/runtime_psk.conf
+++ b/samples/common/runtime_settings.conf
@@ -7,5 +7,6 @@ CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_SETTINGS_RUNTIME=y
 CONFIG_GOLIOTH_SAMPLE_PSK_SETTINGS=y
+CONFIG_GOLIOTH_SAMPLE_WIFI_SETTINGS=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_AUTOLOAD=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_SHELL=y
diff --git a/samples/dfu/README.rst b/samples/dfu/README.rst
index ef24a55e..dfc728e7 100644
--- a/samples/dfu/README.rst
+++ b/samples/dfu/README.rst
@@ -54,7 +54,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/hello/README.rst b/samples/hello/README.rst
index 424647e7..13c8f32e 100644
--- a/samples/hello/README.rst
+++ b/samples/hello/README.rst
@@ -51,7 +51,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/hello/sample.yaml b/samples/hello/sample.yaml
index d91dd1fa..aec92c43 100644
--- a/samples/hello/sample.yaml
+++ b/samples/hello/sample.yaml
@@ -74,4 +74,4 @@ tests:
       - CONFIG_GOLIOTH_AUTH_METHOD_CERT=y
   sample.golioth.hello.psk.runtime.buildonly:
     build_only: true
-    extra_args: EXTRA_CONF_FILE="../common/runtime_psk.conf"
+    extra_args: EXTRA_CONF_FILE="../common/runtime_settings.conf"
diff --git a/samples/hello_sporadic/README.rst b/samples/hello_sporadic/README.rst
index 3248f85e..7d77f3b8 100644
--- a/samples/hello_sporadic/README.rst
+++ b/samples/hello_sporadic/README.rst
@@ -51,7 +51,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/lightdb/delete/README.rst b/samples/lightdb/delete/README.rst
index b13f612f..cb68c6fd 100644
--- a/samples/lightdb/delete/README.rst
+++ b/samples/lightdb/delete/README.rst
@@ -50,7 +50,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/lightdb/get/README.rst b/samples/lightdb/get/README.rst
index baa5c2fd..9c2a6f3a 100644
--- a/samples/lightdb/get/README.rst
+++ b/samples/lightdb/get/README.rst
@@ -50,7 +50,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/lightdb/observe/README.rst b/samples/lightdb/observe/README.rst
index 38421561..ced05104 100644
--- a/samples/lightdb/observe/README.rst
+++ b/samples/lightdb/observe/README.rst
@@ -51,7 +51,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/lightdb/set/README.rst b/samples/lightdb/set/README.rst
index e0555393..86864171 100644
--- a/samples/lightdb/set/README.rst
+++ b/samples/lightdb/set/README.rst
@@ -51,7 +51,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/lightdb_led/README.rst b/samples/lightdb_led/README.rst
index 4072e285..bf748906 100644
--- a/samples/lightdb_led/README.rst
+++ b/samples/lightdb_led/README.rst
@@ -51,7 +51,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/lightdb_stream/README.rst b/samples/lightdb_stream/README.rst
index 2f9ae5a9..f339331b 100644
--- a/samples/lightdb_stream/README.rst
+++ b/samples/lightdb_stream/README.rst
@@ -53,7 +53,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/logging/README.rst b/samples/logging/README.rst
index 88bee31a..836b7c3a 100644
--- a/samples/logging/README.rst
+++ b/samples/logging/README.rst
@@ -51,7 +51,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/rpc/README.rst b/samples/rpc/README.rst
index 23e99e13..d6e45dba 100644
--- a/samples/rpc/README.rst
+++ b/samples/rpc/README.rst
@@ -51,7 +51,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``:
 
diff --git a/samples/settings/README.rst b/samples/settings/README.rst
index 9e63a8c3..856ac69f 100644
--- a/samples/settings/README.rst
+++ b/samples/settings/README.rst
@@ -53,7 +53,7 @@ file:
 
 .. code-block:: console
 
-   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
+   $ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
 
 Alternatively, you can add the following options to ``prj.conf``: