diff --git a/Dockerfile b/Dockerfile
index ef965cd..27b27f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM wordpress:5.5
+FROM wordpress:5.8
 
 COPY ./entrypoint.sh /usr/local/bin/apache2-custom.sh
 RUN chmod 755 /usr/local/bin/apache2-custom.sh
diff --git a/src/index.php b/src/index.php
index 2db0f51..f6a7aa4 100644
--- a/src/index.php
+++ b/src/index.php
@@ -4,7 +4,7 @@
  * Plugin URI: https://github.com/jabranr/nullify-empty-fields-for-acf
  * Description: Set Advanced Custom Fields (ACF) empty field value as <code>null</code> instead of <code>false</code> to avoid GraphQL error in GatsbyJS.
  * Author: Jabran Rafique <hello@jabran.me>
- * Version: 1.2.1
+ * Version: 1.2.2
  * Author URI: https://jabran.me?utm_source=nullify-empty-fields-for-acf
  * License: MIT License
  *
diff --git a/src/readme.txt b/src/readme.txt
index 2bd62f6..c2dcac6 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -3,8 +3,8 @@ Contributors: jabranr
 Donate link: https://paypal.me/jabranr
 Tags: gatsby, graphql, acf, advanced-custom-fields, wordpress
 Requires at least: 5.0
-Tested up to: 5.5
-Stable tag: 1.2.1
+Tested up to: 5.8
+Stable tag: 1.2.2
 Requires PHP: 7.1
 License: MIT License
 License URI: https://opensource.org/licenses/MIT
@@ -27,6 +27,9 @@ Set Advanced Custom Fields (ACF) empty field value as `null` instead of `false`
 
 == Changelog ==
 
+= 1.2.2 =
+* Support for WordPress 5.8
+
 = 1.2.1 =
 * Add icons