diff -Nru kodi-pvr-vdr-vnsi-20.3.1+ds1/azure-pipelines.yml kodi-pvr-vdr-vnsi-20.4.0+ds1/azure-pipelines.yml
--- kodi-pvr-vdr-vnsi-20.3.1+ds1/azure-pipelines.yml	2022-06-20 21:32:29.000000000 +0000
+++ kodi-pvr-vdr-vnsi-20.4.0+ds1/azure-pipelines.yml	2022-09-16 13:44:42.000000000 +0000
@@ -16,27 +16,27 @@
   - job: Windows
 
     pool:
-      vmImage: 'VS2017-Win2016'
+      vmImage: 'windows-2022'
 
     strategy:
       matrix:
         Win32:
-          GENERATOR: "Visual Studio 15 2017"
+          GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: Win32
           CONFIGURATION: Release
           CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
         Win64:
-          GENERATOR: "Visual Studio 15 2017"
+          GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: x64
           CONFIGURATION: Release
           CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
         Win64-UWP:
-          GENERATOR: "Visual Studio 15 2017"
+          GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: x64
           CONFIGURATION: Release
           CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
         ARM64-UWP:
-          GENERATOR: "Visual Studio 15 2017"
+          GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: ARM64
           CONFIGURATION: Release
           CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
diff -Nru kodi-pvr-vdr-vnsi-20.3.1+ds1/debian/changelog kodi-pvr-vdr-vnsi-20.4.0+ds1/debian/changelog
--- kodi-pvr-vdr-vnsi-20.3.1+ds1/debian/changelog	2022-08-04 09:55:17.000000000 +0000
+++ kodi-pvr-vdr-vnsi-20.4.0+ds1/debian/changelog	2022-10-15 16:55:05.000000000 +0000
@@ -1,3 +1,10 @@
+kodi-pvr-vdr-vnsi (20.4.0+ds1-1) unstable; urgency=medium
+
+  * New upstream version 20.4.0+ds1
+  * d/watch: switch to git tags
+
+ -- Vasyl Gello <vasek.gello@gmail.com>  Sat, 15 Oct 2022 16:55:05 +0000
+
 kodi-pvr-vdr-vnsi (20.3.1+ds1-1) unstable; urgency=medium
 
   * New upstream version 20.3.1+ds1
diff -Nru kodi-pvr-vdr-vnsi-20.3.1+ds1/debian/watch kodi-pvr-vdr-vnsi-20.4.0+ds1/debian/watch
--- kodi-pvr-vdr-vnsi-20.3.1+ds1/debian/watch	2022-08-04 09:55:17.000000000 +0000
+++ kodi-pvr-vdr-vnsi-20.4.0+ds1/debian/watch	2022-10-15 16:55:05.000000000 +0000
@@ -1,8 +1,14 @@
 version=4
 
-opts="repack, \
-      compression=xz, \
+# Release git tags
+# TODO: Change Kodi codename in refs/tags before packaging next Kodi major release
+
+opts="mode=git, \
+      pgpmode=none, \
+      repack, \
       repacksuffix=+ds1, \
+      compression=xz, \
       dversionmangle=auto" \
-https://github.com/kodi-pvr/pvr.vdr.vnsi/releases \
-/kodi-pvr/pvr.vdr.vnsi/archive/refs/tags/?(\d\S*)-Nexus\.tar\.gz
+https://github.com/kodi-pvr/pvr.vdr.vnsi \
+refs/tags/@ANY_VERSION@-Nexus \
+debian
diff -Nru kodi-pvr-vdr-vnsi-20.3.1+ds1/pvr.vdr.vnsi/addon.xml.in kodi-pvr-vdr-vnsi-20.4.0+ds1/pvr.vdr.vnsi/addon.xml.in
--- kodi-pvr-vdr-vnsi-20.3.1+ds1/pvr.vdr.vnsi/addon.xml.in	2022-06-20 21:32:29.000000000 +0000
+++ kodi-pvr-vdr-vnsi-20.4.0+ds1/pvr.vdr.vnsi/addon.xml.in	2022-09-16 13:44:42.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vdr.vnsi"
-  version="20.3.1"
+  version="20.4.0"
   name="VDR VNSI Client"
   provider-name="Team Kodi, FernetMenta">
   <requires>@ADDON_DEPENDS@</requires>
diff -Nru kodi-pvr-vdr-vnsi-20.3.1+ds1/pvr.vdr.vnsi/changelog.txt kodi-pvr-vdr-vnsi-20.4.0+ds1/pvr.vdr.vnsi/changelog.txt
--- kodi-pvr-vdr-vnsi-20.3.1+ds1/pvr.vdr.vnsi/changelog.txt	2022-06-20 21:32:29.000000000 +0000
+++ kodi-pvr-vdr-vnsi-20.4.0+ds1/pvr.vdr.vnsi/changelog.txt	2022-09-16 13:44:42.000000000 +0000
@@ -1,3 +1,7 @@
+v20.4.0
+- Kodi inputstream API update to version 3.2.0
+- Kodi PVR API update to version 8.0.2
+
 v20.3.1
 - Fix further crashes on some channels