diff --git a/Gemfile b/Gemfile
index 17b234dd85ec26e1e2c176cb4eb343b3c838b3a7..9a525463d8ffcfa1bd8261547e84da1de4ac2d19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,12 +27,13 @@ source "https://rubygems.org" do
   gem "faraday",             "~> 1.0", :require => false
   gem "faraday_middleware",  "~> 1.0.0.rc1", :require => false
   gem "net-http-persistent", "~> 4.0", :require => false
-  if RUBY_VERSION.start_with?("2.3") then
-    gem "nokogiri",            "~> 1.10.4", :require => false
+  if RUBY_VERSION < "2.4.0"
+    gem "nokogiri",          "~> 1.10.4", :require => false
+  elsif RUBY_VERSION < "2.5.0"
+    gem "nokogiri",          "~> 1.11.0.rc2", :require => false
   else
-    gem "nokogiri",            "~> 1.11.0.rc2", :require => false
+    gem "nokogiri",          "~> 1", ">= 1.12.5", :require => false
   end
-
   gem "adal",                "~> 1.0", :require => false
   gem "dotenv",              "~> 2.0", :require => false
   gem "minitest",            "~> 5", :require => false
diff --git a/blob/ChangeLog.md b/blob/ChangeLog.md
index 51b7e270f3aaf94dd329717e125c44ec449fcaf5..aa415420aaf5b282e77c210fded09c4bb7352c2f 100644
--- a/blob/ChangeLog.md
+++ b/blob/ChangeLog.md
@@ -1,3 +1,6 @@
+2021.10 - version 2.0.2
+* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+
 2020.8 - version 2.0.1
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
 
diff --git a/blob/azure-storage-blob.gemspec b/blob/azure-storage-blob.gemspec
index 24893e1954976d9e11d0569a29d186b8318fc4bc..04adf40c57fb1da2285312a557a500c81cea9ce7 100644
--- a/blob/azure-storage-blob.gemspec
+++ b/blob/azure-storage-blob.gemspec
@@ -43,10 +43,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
-  else
+  elsif RUBY_VERSION < "2.5.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+  else
+    s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
-
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")
   s.add_development_dependency("minitest-reporters",  "~> 1")
diff --git a/blob/lib/azure/storage/blob/version.rb b/blob/lib/azure/storage/blob/version.rb
index ca7932c52c05df4f1b07f19e4722b9296fbf8c2a..e0c95a63cbb303d1d7f0d724cdeff873bc8ebe23 100644
--- a/blob/lib/azure/storage/blob/version.rb
+++ b/blob/lib/azure/storage/blob/version.rb
@@ -31,7 +31,7 @@ module Azure
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 2 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 1 unless defined? UPDATE
+        UPDATE = 2 unless defined? UPDATE
 
         class << self
           # @return [String]
diff --git a/common/ChangeLog.md b/common/ChangeLog.md
index 8531e7f95e78f75eb08b68b0ddef555f96c5c1e5..4de2c428055268880255264b9fd66f0f5702f786 100644
--- a/common/ChangeLog.md
+++ b/common/ChangeLog.md
@@ -1,3 +1,6 @@
+2021.10 - version 2.0.3
+* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
 * Changed to use persistent HTTP client to speed up requests #168.
diff --git a/common/azure-storage-common.gemspec b/common/azure-storage-common.gemspec
index 2906823fc79a03bee7f7ea906695cab04f082b81..4320f04acca94140ae2431653d2b5e5e67be21ac 100644
--- a/common/azure-storage-common.gemspec
+++ b/common/azure-storage-common.gemspec
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
   else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+    s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
 
   s.add_development_dependency("dotenv",              "~> 2.0")
diff --git a/common/lib/azure/storage/common/version.rb b/common/lib/azure/storage/common/version.rb
index d59b4abd358a21803cd934b70ed22cc15cd8f9ef..ed9da12f4c724286f36720f97b891db1486ef394 100644
--- a/common/lib/azure/storage/common/version.rb
+++ b/common/lib/azure/storage/common/version.rb
@@ -31,7 +31,7 @@ module Azure
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 2 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 2 unless defined? UPDATE
+        UPDATE = 3 unless defined? UPDATE
 
         class << self
           # @return [String]
diff --git a/file/ChangeLog.md b/file/ChangeLog.md
index 7a86b557893f23093af2b8a770008ad4b7b97a7d..fc5d41edfa9852cfed4a27b83320917f286c75b1 100644
--- a/file/ChangeLog.md
+++ b/file/ChangeLog.md
@@ -1,3 +1,6 @@
+2021.10 - version 2.0.3
+* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
 
diff --git a/file/azure-storage-file.gemspec b/file/azure-storage-file.gemspec
index 71a5a317089227c3eaa1a8dd554b3c986162a573..5806803630cd8b052bd1298244cca46d96578e8f 100644
--- a/file/azure-storage-file.gemspec
+++ b/file/azure-storage-file.gemspec
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
   else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+    s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
 
   s.add_development_dependency("dotenv",              "~> 2.0")
diff --git a/file/lib/azure/storage/file/version.rb b/file/lib/azure/storage/file/version.rb
index 3e1f811c7c59f5844c36dc990c36ee7867160a10..f2465dd8e71488bdac743347a14fdae49602156d 100644
--- a/file/lib/azure/storage/file/version.rb
+++ b/file/lib/azure/storage/file/version.rb
@@ -31,7 +31,7 @@ module Azure
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 2 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 2 unless defined? UPDATE
+        UPDATE = 3 unless defined? UPDATE
 
         class << self
           # @return [String]
diff --git a/queue/ChangeLog.md b/queue/ChangeLog.md
index cdce28d9afc51ff485f965caf8d743228ce5954c..f60a89e40cf5cf43782d492685bfe145386dfe54 100644
--- a/queue/ChangeLog.md
+++ b/queue/ChangeLog.md
@@ -1,3 +1,6 @@
+2021.10 - version 2.0.3
+* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
 
diff --git a/queue/azure-storage-queue.gemspec b/queue/azure-storage-queue.gemspec
index d6d61b0a3a4ebb6654a3f48ac90a68a61e69b0f1..954271e0e12452ef0c7e024878af2f101df9270b 100644
--- a/queue/azure-storage-queue.gemspec
+++ b/queue/azure-storage-queue.gemspec
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
   else
-    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+    s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
 
   s.add_development_dependency("dotenv",              "~> 2.0")
diff --git a/queue/lib/azure/storage/queue/version.rb b/queue/lib/azure/storage/queue/version.rb
index 16254fd393bc0cf9bddcffebac085aaea237b051..12fc9def8abf28e41390b323313422340a1a1d01 100644
--- a/queue/lib/azure/storage/queue/version.rb
+++ b/queue/lib/azure/storage/queue/version.rb
@@ -31,7 +31,7 @@ module Azure
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 2 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 2 unless defined? UPDATE
+        UPDATE = 3 unless defined? UPDATE
 
         class << self
           # @return [String]
diff --git a/table/ChangeLog.md b/table/ChangeLog.md
index 62eb4625d9cba2fa8dfff24e7538a1c99576235b..aca61b126d9259e0e32be7e04abf20c38baafc78 100644
--- a/table/ChangeLog.md
+++ b/table/ChangeLog.md
@@ -1,3 +1,6 @@
+2021.10 - version 2.0.3
+* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
 
diff --git a/table/azure-storage-table.gemspec b/table/azure-storage-table.gemspec
index 21385fcdd46a48ea0ec442cac029df04869a5d1a..da453696a1a7516b956c16075392655e36882c18 100644
--- a/table/azure-storage-table.gemspec
+++ b/table/azure-storage-table.gemspec
@@ -43,10 +43,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
-  else
+  elsif RUBY_VERSION < "2.5.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+  else
+    s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
-
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")
   s.add_development_dependency("minitest-reporters",  "~> 1")
diff --git a/table/lib/azure/storage/table/version.rb b/table/lib/azure/storage/table/version.rb
index 043675d8e444970565d4d06758117076c2961521..3e3462526f9900727042d1294dfc4dd2903386b2 100644
--- a/table/lib/azure/storage/table/version.rb
+++ b/table/lib/azure/storage/table/version.rb
@@ -31,7 +31,7 @@ module Azure
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 2 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 2 unless defined? UPDATE
+        UPDATE = 3 unless defined? UPDATE
 
         class << self
           # @return [String]