diff --git a/config/nginx/common/wpcommon.conf b/config/nginx/common/wpcommon.conf
index eb6c4918..91450a79 100644
--- a/config/nginx/common/wpcommon.conf
+++ b/config/nginx/common/wpcommon.conf
@@ -27,8 +27,10 @@ location /wp-content/uploads/ {
 location ~ ([^/]*)sitemap(.*)\.x(m|s)l$ {
 	rewrite ^/sitemap\.xml$ /sitemap_index.xml permanent;
   rewrite ^/([a-z]+)?-?sitemap\.xsl$ /index.php?xsl=$1 last;
-	rewrite ^/sitemap_index\.xml$ /index.php?sitemap=1 last;
-	rewrite ^/([^/]+?)-sitemap([0-9]+)?\.xml$ /index.php?sitemap=$1&sitemap_n=$2 last;
+
+  # Rules for yoast sitemap with wp|wpsubdir|wpsubdomain 
+	rewrite ^.*/sitemap_index\.xml$ /index.php?sitemap=1 last;
+	rewrite ^.*/([^/]+?)-sitemap([0-9]+)?\.xml$ /index.php?sitemap=$1&sitemap_n=$2 last;
 
   # Following lines are options. Needed for WordPress seo addons
   rewrite ^/news_sitemap\.xml$ /index.php?sitemap=wpseo_news last;