diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml
index 1806ca0..6d634a7 100644
--- a/.forgejo/workflows/release-build.yaml
+++ b/.forgejo/workflows/release-build.yaml
@@ -9,15 +9,15 @@ jobs:
     container:
       image: ubuntu:22.04
     env:
-      pkgver: 8.1.3
-      buildno: 3
+      pkgver: 8.1.1
+      buildno: 39
       qtver: 5.15.3
     steps:
       - name: Environment setup
         run: |
           cat /etc/os-release
           apt-get update
-          apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper clang-14 lld-14
+          apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper
           curl -sL https://deb.nodesource.com/setup_16.x | bash -
           apt-get install -y nodejs
           npm install -g pkg grunt grunt-cli
@@ -34,7 +34,7 @@ jobs:
       - name: Applying patches
         run: |
           cd build
-          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-use-system-clang.patch
+          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-no-enum-constexrp-conversion.patch
           git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch
       - name: Development setup
         run: |
diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml
index f73eb9e..fb782b8 100644
--- a/.forgejo/workflows/test-build.yaml
+++ b/.forgejo/workflows/test-build.yaml
@@ -8,15 +8,15 @@ jobs:
     container:
       image: ubuntu:22.04
     env:
-      pkgver: 8.1.3
-      buildno: 3
+      pkgver: 8.1.1
+      buildno: 39
       qtver: 5.15.3
     steps:
       - name: Environment setup
         run: |
           cat /etc/os-release
           apt-get update
-          apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper clang-14 lld-14
+          apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper
           curl -sL https://deb.nodesource.com/setup_16.x | bash -
           apt-get install -y nodejs
           npm install -g pkg grunt grunt-cli
@@ -33,7 +33,7 @@ jobs:
       - name: Applying patches
         run: |
           cd build
-          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-use-system-clang.patch
+          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-no-enum-constexrp-conversion.patch
           git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch
       - name: Development setup
         run: |
diff --git a/core_v8-no-enum-constexrp-conversion.patch b/core_v8-no-enum-constexrp-conversion.patch
new file mode 100644
index 0000000..da56ce3
--- /dev/null
+++ b/core_v8-no-enum-constexrp-conversion.patch
@@ -0,0 +1,34 @@
+diff --git a/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch b/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch
+new file mode 100644
+index 0000000000..5a1a8067a6
+--- /dev/null
++++ b/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch
+@@ -0,0 +1,14 @@
++diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
++index 5ea2f213..29fa7742 100644
++--- a/build/config/compiler/BUILD.gn
+++++ b/build/config/compiler/BUILD.gn
++@@ -1548,6 +1548,9 @@ config("default_warnings") {
++           # TODO(https://crbug.com/989932): Evaluate and possibly enable.
++           "-Wno-implicit-int-float-conversion",
++
+++          "-Wno-enum-constexpr-conversion",
+++
+++
++           # TODO(https://crbug.com/999886): Clean up, enable.
++           "-Wno-final-dtor-non-final-class",
++
+diff --git a/build_tools/scripts/core_common/modules/v8_89.py b/core/build_tools/core_common/modules/v8_89.py
+index 9643263..35ee1fe 100644
+--- a/build_tools/scripts/core_common/modules/v8_89.py
++++ b/build_tools/scripts/core_common/modules/v8_89.py
+@@ -150,6 +150,8 @@ def make():
+              "use_custom_libcxx=false",
+              "treat_warnings_as_errors=false"]
+ 
++  base.cmd("patch", ["-p1", "-i", "../../v8/tools/no-enum-constexrp-conversion.patch"])
++
+   if config.check_option("platform", "linux_64"):
+     base.cmd2("gn", ["gen", "out.gn/linux_64", make_args(gn_args, "linux")])
+     base.cmd("ninja", ["-C", "out.gn/linux_64"])
+
diff --git a/core_v8-use-system-clang.patch b/core_v8-use-system-clang.patch
deleted file mode 100644
index cdbb4c9..0000000
--- a/core_v8-use-system-clang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/build_tools/scripts/core_common/modules/v8_89.py
-+++ b/build_tools/scripts/core_common/modules/v8_89.py
-@@ -48,6 +48,8 @@ def make_args(args, platform, is_64=True, is_debug=False):
-   
-   if (platform == "linux"):
-     args_copy.append("is_clang=true")
-+    args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"")
-+    args_copy.append("clang_use_chrome_plugins=false")
-     args_copy.append("use_sysroot=false")
-   if (platform == "windows"):
-     args_copy.append("is_clang=false")
-