diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index bb29b28d..7ec8bf5e 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -12,24 +12,25 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  ubuntu-20-04:
-    strategy:
-      matrix:
-        target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64, win32, win64, pluginval]
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - uses: distrho/dpf-cmake-action@v1
-        with:
-          target: ${{ matrix.target }}
-          dpf_path: .
+  #ubuntu-20-04:
+    #strategy:
+      #matrix:
+        #target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64, win32, win64, pluginval]
+    #runs-on: ubuntu-20.04
+    #steps:
+      #- uses: actions/checkout@v3
+        #with:
+          #submodules: recursive
+      #- uses: distrho/dpf-cmake-action@v1
+        #with:
+          #target: ${{ matrix.target }}
+          #dpf_path: .
 
   ubuntu-22-04:
     strategy:
       matrix:
-        target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64, win32, win64, pluginval]
+        target: [linux-arm64, linux-armhf, linux-i686, linux-x86_64, win32, win64, pluginval]
+        # linux-riscv64,
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/example-plugins.yml b/.github/workflows/example-plugins.yml
index 76de1644..bd48e7e0 100644
--- a/.github/workflows/example-plugins.yml
+++ b/.github/workflows/example-plugins.yml
@@ -9,24 +9,25 @@ on:
       - '*'
 
 jobs:
-  ubuntu-20-04:
-    strategy:
-      matrix:
-        target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64, win32, win64, pluginval]
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - uses: distrho/dpf-makefile-action@v1
-        with:
-          dpf_path: .
-          target: ${{ matrix.target }}
+  #ubuntu-20-04:
+    #strategy:
+      #matrix:
+        #target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64, win32, win64, pluginval]
+    #runs-on: ubuntu-20.04
+    #steps:
+      #- uses: actions/checkout@v3
+        #with:
+          #submodules: recursive
+      #- uses: distrho/dpf-makefile-action@v1
+        #with:
+          #dpf_path: .
+          #target: ${{ matrix.target }}
 
   ubuntu-22-04:
     strategy:
       matrix:
-        target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64, win32, win64, pluginval]
+        target: [linux-arm64, linux-armhf, linux-i686, linux-x86_64, win32, win64, pluginval]
+        # linux-riscv64,
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index 85ba6875..39619482 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   linux-x86_64:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
diff --git a/cmake/DPF-plugin.cmake b/cmake/DPF-plugin.cmake
index d61a390f..fa640aea 100644
--- a/cmake/DPF-plugin.cmake
+++ b/cmake/DPF-plugin.cmake
@@ -992,6 +992,8 @@ function(dpf__add_plugin_specific_ui_sources NAME USE_WEB_VIEW)
   elseif(WIN32 AND USE_WEB_VIEW)
     target_sources("${NAME}" PRIVATE
       "${DPF_ROOT_DIR}/distrho/DistrhoUI_win32.cpp")
+    set_source_files_properties("${DPF_ROOT_DIR}/distrho/DistrhoUI_win32.cpp"
+      PROPERTIES COMPILE_FLAGS -std=gnu++17)
   endif()
 endfunction()