diff --git a/.appveyor.yml b/.appveyor.yml
index c00dbcb..34a162e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,23 +25,33 @@ cache:
 environment:
     BIN_SDK_VER: 2.2.0
     matrix:
-        - PHP_VER: 7.4.0
+        - PHP_VER: 8.0.0
           ARCH: x64
           TS: 1
-          VC: vc15
-          APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-        - PHP_VER: 7.4.0
+          VC: vs16
+          APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+        - PHP_VER: 8.0.0
           ARCH: x64
           TS: 0
-          VC: vc15
-          APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-        - PHP_VER: 7.4.0
+          VC: vs16
+          APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+        - PHP_VER: 8.0.0
           ARCH: x86
           TS: 1
+          VC: vs16
+          APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+        - PHP_VER: 8.0.0
+          ARCH: x86
+          TS: 0
+          VC: vs16
+          APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+        - PHP_VER: 7.4.0
+          ARCH: x64
+          TS: 1
           VC: vc15
           APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
         - PHP_VER: 7.4.0
-          ARCH: x86
+          ARCH: x64
           TS: 0
           VC: vc15
           APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
diff --git a/package.xml b/package.xml
index 5621314..4c2b9f2 100644
--- a/package.xml
+++ b/package.xml
@@ -12,11 +12,11 @@
   <email>laruence@php.net</email>
   <active>yes</active>
  </lead>
- <date>2021-01-06</date>
- <time>14:30:00</time>
+ <date>2021-12-18</date>
+ <time>16:30:00</time>
  <version>
-  <release>2.3.0</release>
-  <api>2.3.0</api>
+  <release>2.3.1</release>
+  <api>2.3.1</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
  <notes>
-  - PHP8 Supported
+  - PHP8.1 Supports
  </notes>
  <contents> 
   <dir name="/"> 
@@ -89,7 +89,6 @@
     <file name="021.phpt" role="test" />
     <file name="022.phpt" role="test" />
     <file name="023.phpt" role="test" />
-    <file name="024.phpt" role="test" />
     <file name="issue012.phpt" role="test" />
    </dir>
   </dir> 
@@ -111,6 +110,22 @@
   <configureoption name="enable-msgpack" prompt="enable msgpack serializer support?" default="no"/>
  </extsrcrelease>
  <changelog> 
+  <release> 
+   <date>2021-12-18</date> 
+   <version>
+    <release>2.3.1</release> 
+    <api>2.3.1</api> 
+   </version> 
+   <stability> 
+    <release>stable</release> 
+    <api>stable</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes>
+    - PHP8.1 Supports
+   </notes> 
+  </release> 
+
   <release> 
    <date>2021-01-06</date> 
    <version>
@@ -126,7 +141,6 @@
     - PHP8 Supported
    </notes> 
   </release> 
-
   <release> 
    <date>2020-03-31</date> 
    <version>
diff --git a/php_yac.h b/php_yac.h
index 1f9096a..e7913d6 100644
--- a/php_yac.h
+++ b/php_yac.h
@@ -34,7 +34,7 @@ extern zend_module_entry yac_module_entry;
 #include "TSRM.h"
 #endif
 
-#define PHP_YAC_VERSION "2.3.1-dev"
+#define PHP_YAC_VERSION "2.3.2-dev"
 
 #if PHP_VERSION_ID < 70400
 #define YAC_WHANDLER            void
diff --git a/tests/023.phpt b/tests/023.phpt
index a6c7a78..7f38f01 100644
--- a/tests/023.phpt
+++ b/tests/023.phpt
@@ -3,9 +3,6 @@ Check for inherit from Yac
 --SKIPIF--
 <?php
 if (!extension_loaded("yac")) die("skip");
-if (version_compare(PHP_VERSION, "8.1.0", ">=")) {
-   die("skip only PHP8.0 and below is supported");
-}
 ?>
 --INI--
 yac.enable=0
@@ -14,4 +11,4 @@ yac.enable=0
 class Sub extends Yac {};
 ?>
 --EXPECTF--
-Fatal error: Class Sub may not inherit from final class (Yac) in %s023.php on line %d
+Fatal error: Class Sub %s final class %s
diff --git a/tests/024.phpt b/tests/024.phpt
deleted file mode 100644
index 7cfa499..0000000
--- a/tests/024.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Check for inherit from Yac
---SKIPIF--
-<?php
-if (!extension_loaded("yac")) die("skip");
-if (version_compare(PHP_VERSION, "8.1.0", "<")) {
-   die("skip only PHP8.1 and above is supported");
-}
-?>
---INI--
-yac.enable=0
---FILE--
-<?php
-class Sub extends Yac {};
-?>
---EXPECTF--
-Fatal error: Class Sub cannot extend final class Yac in %s024.php on line %d