diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 015ada5ec0e..54b7cd37fa4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/checkout@v3.0.2
       - name: Setting up Node.js
-        uses: actions/setup-node@v3.4.1
+        uses: actions/setup-node@v3.5.0
         with:
           node-version: 16.x
           cache: "npm"
@@ -27,7 +27,7 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/checkout@v3.0.2
       - name: Setting up Node.js
-        uses: actions/setup-node@v3.4.1
+        uses: actions/setup-node@v3.5.0
         with:
           node-version: 16.x
           cache: "npm"
diff --git a/Gemfile b/Gemfile
index c859899de8b..a7def5a3d57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ group :jekyll_plugins do
   gem 'jekyll-toc', '0.17.1'
 end
 
-gem 'sinatra', '3.0.0'
+gem 'sinatra', '3.0.1'
 gem 'nokogiri', '1.13.8'
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/Gemfile.lock b/Gemfile.lock
index b35cfba35e4..a1f33b89f49 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,7 +80,7 @@ GEM
     public_suffix (5.0.0)
     racc (1.6.0)
     rack (2.2.4)
-    rack-protection (3.0.0)
+    rack-protection (3.0.1)
       rack
     rake (13.0.6)
     rb-fsevent (0.11.2)
@@ -97,10 +97,10 @@ GEM
       ffi (~> 1.9)
     sassc (2.1.0-x64-mingw32)
       ffi (~> 1.9)
-    sinatra (3.0.0)
+    sinatra (3.0.1)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.0)
+      rack-protection (= 3.0.1)
       tilt (~> 2.0)
     stringex (2.8.5)
     terminal-table (2.0.0)
@@ -127,7 +127,7 @@ DEPENDENCIES
   rake (= 13.0.6)
   sass-globbing (= 1.1.5)
   sassc (= 2.1.0)
-  sinatra (= 3.0.0)
+  sinatra (= 3.0.1)
   stringex (= 2.8.5)
   tzinfo (~> 2.0)
   tzinfo-data
diff --git a/source/_integrations/ezviz.markdown b/source/_integrations/ezviz.markdown
index 13ba3674eed..0f9d9b51c5e 100644
--- a/source/_integrations/ezviz.markdown
+++ b/source/_integrations/ezviz.markdown
@@ -1,6 +1,6 @@
 ---
-title: Ezviz
-description: Integrate Ezviz camera within Home Assistant.
+title: EZVIZ
+description: Integrate EZVIZ camera within Home Assistant.
 ha_release: 0.107
 ha_category:
   - Camera
@@ -18,10 +18,10 @@ ha_platforms:
 ha_integration_type: integration
 ---
 
-The `ezviz` sensor platform uses the EzvizLife API to interact with the devices.
+The `ezviz` sensor platform uses the ezvizlife.com API to interact with the devices.
 It also exposes an RTSP stream, by using the local camera IPs (so the device hosting Home Assistant has to be able to access the local IP of the cameras).
 
-As there is no official documentation for the API, the component retrieves data from the API used in the Ezviz mobile app, [hosted here](https://apiieu.ezvizlife.com).
+As there is no official documentation for the API, the component retrieves data from the API used in the EZVIZ mobile app, [hosted here](https://apiieu.ezvizlife.com).
 
 The password for each camera is usually written near the QR code. This could be underneath the device or in the user manual. It is usually referred to as the camera "verification code".
 
@@ -33,7 +33,7 @@ You can also change the camera options should you need to access a high or low r
 
 ### Service `ezviz.alarm_sound`
 
-If your Ezviz camera supports warning sounds, you can use this service to set the intensity.
+If your EZVIZ camera supports warning sounds, you can use this service to set the intensity.
 
 | Service data attribute | Description |
 | -----------------------| ----------- |
@@ -42,7 +42,7 @@ If your Ezviz camera supports warning sounds, you can use this service to set th
 
 ### Service `ezviz.ptz`
 
-If your Ezviz camera supports PTZ, you will be able to pan or tilt your camera.
+If your EZVIZ camera supports PTZ, you will be able to pan or tilt your camera.
 
 | Service data attribute | Description |
 | -----------------------| ----------- |
@@ -52,7 +52,7 @@ If your Ezviz camera supports PTZ, you will be able to pan or tilt your camera.
 
 ### Service `ezviz.set_alarm_detection_sensibility`
 
-If your Ezviz camera supports motion detection, you will be able to set the sensitivity level using this service.
+If your EZVIZ camera supports motion detection, you will be able to set the sensitivity level using this service.
 
 | Service data attribute | Description |
 | -----------------------| ----------- |
@@ -62,7 +62,7 @@ If your Ezviz camera supports motion detection, you will be able to set the sens
 
 ### Service `ezviz.sound_alarm`
 
-If your Ezviz camera has a built-in siren, you can use this service to make a noise.
+If your EZVIZ camera has a built-in siren, you can use this service to make a noise.
 
 | Service data attribute | Description |
 | -----------------------| ----------- |
diff --git a/source/_integrations/switcher_kis.markdown b/source/_integrations/switcher_kis.markdown
index 70aef344490..60f1f668e69 100644
--- a/source/_integrations/switcher_kis.markdown
+++ b/source/_integrations/switcher_kis.markdown
@@ -66,4 +66,5 @@ Note: This does not affect the auto off timer.
 
 ## Notes
 
-If Home Assistant and your Switcher are not on the same network, you need to create a firewall rule, which allows a connection on port 20002 with the UDP protocol from Switcher to your Home Assistant and port 9957 with the TCP protocol from Home Assistant to your Switcher.
+Make sure that Home Assistant host's firewall allows incoming traffic on UDP port 20002 and outgoing connections to Switcher device(s) on TCP port 9957.
+If Home Assistant and the Switcher device(s) are not on the same network, you will also need to have their traffic properly forwarded between the two networks.