diff --git a/Gemfile.lock b/Gemfile.lock
index b81e9ca59e0..9cd2fa15c82 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,8 +130,9 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.41.0)
+    rubocop-ast (1.43.0)
       parser (>= 3.3.7.2)
+      prism (~> 1.4)
     ruby-lsp (0.23.12)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
@@ -158,7 +159,7 @@ GEM
       rack-protection (= 4.1.1)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.11954)
+    sorbet-runtime (0.5.11956)
     stringex (2.8.6)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
diff --git a/source/_integrations/imgw_pib.markdown b/source/_integrations/imgw_pib.markdown
index 0bc138daad0..13936cf278b 100644
--- a/source/_integrations/imgw_pib.markdown
+++ b/source/_integrations/imgw_pib.markdown
@@ -15,7 +15,14 @@ ha_platforms:
 ha_integration_type: integration
 ---
 
-IMGW-PIB integration uses hydrological data from [Institute of Meteorology and Water Management - National Research Institute](https://hydro.imgw.pl) to present information about rivers and water reservoirs in Poland.
+IMGW-PIB {% term integration %} uses hydrological data from [Institute of Meteorology and Water Management - National Research Institute](https://hydro.imgw.pl) to present information about rivers and water reservoirs in Poland.
+
+{% include integrations/config_flow.md %}
+
+{% configuration_basic %}
+Hydrological station:
+    description: "Select a hydrological station from the list of available stations."
+{% endconfiguration_basic %}
 
 ## Sensors
 
@@ -24,6 +31,8 @@ Sensor entities added to Home Assistant:
 - Water level
 - Water temperature (if a given hydrological station supports it)
 
-## Setup
+## Removing the integration
 
-{% include integrations/config_flow.md %}
+This integration follows standard integration removal, no extra steps are required.
+
+{% include integrations/remove_device_service.md %}
diff --git a/source/_integrations/nut.markdown b/source/_integrations/nut.markdown
index 4ec72d95c7d..2565224d329 100644
--- a/source/_integrations/nut.markdown
+++ b/source/_integrations/nut.markdown
@@ -21,6 +21,9 @@ ha_platforms:
   - sensor
   - switch
 ha_integration_type: device
+related:
+  - url: https://www.networkupstools.org
+    title: Network UPS Tools
 ---
 
 The **Network UPS Tools (NUT)** {% term integration %} allows you to monitor and manage an Uninterruptible Power Supply (UPS) for battery backup, a Power Distribution Unit (PDU), or other similar power device using a [NUT](https://networkupstools.org/) server. It lets you view the status, receive notifications about important events, and execute commands as device actions for one or more such devices.
diff --git a/source/_integrations/shelly.markdown b/source/_integrations/shelly.markdown
index cbe1b3a8db2..c6ae4a0d2a5 100644
--- a/source/_integrations/shelly.markdown
+++ b/source/_integrations/shelly.markdown
@@ -49,6 +49,13 @@ Integrate [Shelly devices](https://shelly.com) into Home Assistant.
 
 {% include integrations/config_flow.md %}
 
+{% configuration_basic %}
+Host:
+    description: "The Hostname or IP address of your Shelly device. You can find it in your router."
+Port:
+    description: "Custom TCP port of the device. Change this only if the device is connected via Shelly Range Extender."
+{% endconfiguration_basic %}
+
 ## Shelly device generations
 
 There are four generations of devices and all generations are supported by this integration. There are some differences in how devices should be configured and in the naming of entities and devices between generations.
@@ -373,3 +380,9 @@ Please check from the device Web UI that the configured server is reachable.
 - Before set up, battery-powered devices must be woken up by pressing the button on the device.
 - For battery-powered devices, the `update` platform entities only inform about the availability of firmware updates but are not able to trigger the update process.
 - Using the `homeassistant.update_entity` action for an entity belonging to a battery-powered device is not possible because most of the time these devices are sleeping (are offline).
+
+## Removing the integration
+
+This integration follows standard integration removal, no extra steps are required.
+
+{% include integrations/remove_device_service.md %}