diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py
index d1ea138..4a940d7 100644
--- a/wo/cli/plugins/stack_pref.py
+++ b/wo/cli/plugins/stack_pref.py
@@ -221,11 +221,8 @@ def post_pref(self, apt_packages, packages, upgrade=False):
                     'stub_status.mustache', data)
                 data = dict(release=WOVar.wo_version)
                 WOTemplate.deploy(
-                    self, '{0}/webp.conf'.format(ngxcnf),
-                    'webp.mustache', data, overwrite=False)
-                WOTemplate.deploy(
-                    self, '{0}/avif.conf'.format(ngxcnf),
-                    'avif.mustache', data, overwrite=False)
+                    self, '{0}/image_suffix.conf'.format(ngxcnf),
+                    'image_suffix.mustache', data, overwrite=False)
 
                 WOTemplate.deploy(
                     self, '{0}/cloudflare.conf'.format(ngxcnf),
diff --git a/wo/cli/templates/avif.mustache b/wo/cli/templates/image_suffix.mustache
similarity index 75%
rename from wo/cli/templates/avif.mustache
rename to wo/cli/templates/image_suffix.mustache
index 4685ba8..7f8019f 100644
--- a/wo/cli/templates/avif.mustache
+++ b/wo/cli/templates/image_suffix.mustache
@@ -1,12 +1,13 @@
-# avif NGINX CONFIGURATION - WordOps {{release}}
+# Image suffix NGINX CONFIGURATION - WordOps {{release}}
 # DO NOT MODIFY, ALL CHANGES WILL BE LOST AFTER AN WordOps (wo) UPDATE
 
-map $http_accept $avif_suffix_valid {
+map $http_accept $image_suffix_valid {
    default 1;
-   "~*avif" 0;
+   "~*avif" 2;
+   "~*webp" 3;
 }
 
-map $realip_remote_addr $avif_suffix_cf {
+map $realip_remote_addr $image_suffix_cf {
     default 0;
     103.21.244.0/22         1;
     103.22.200.0/22         1;
@@ -33,7 +34,8 @@ map $realip_remote_addr $avif_suffix_cf {
 
 }
 
-map $avif_suffix_cf$avif_suffix_valid $avif_suffix {
+map $image_suffix_cf$image_suffix_valid $image_suffix {
     default "";
-    00 ".avif";
+    02 ".avif";
+    03 ".webp";
 }
\ No newline at end of file
diff --git a/wo/cli/templates/webp.mustache b/wo/cli/templates/webp.mustache
deleted file mode 100644
index aa84b2e..0000000
--- a/wo/cli/templates/webp.mustache
+++ /dev/null
@@ -1,39 +0,0 @@
-# WEBP NGINX CONFIGURATION - WordOps {{release}}
-# DO NOT MODIFY, ALL CHANGES WILL BE LOST AFTER AN WordOps (wo) UPDATE
-
-map $http_accept $webp_suffix_valid {
-   default 1;
-   "~*webp" 0;
-}
-
-map $realip_remote_addr $webp_suffix_cf {
-    default 0;
-    103.21.244.0/22         1;
-    103.22.200.0/22         1;
-    103.31.4.0/22           1;
-    104.16.0.0/12           1;
-    108.162.192.0/18        1;
-    131.0.72.0/22           1;
-    141.101.64.0/18         1;
-    162.158.0.0/15          1;
-    172.64.0.0/13           1;
-    173.245.48.0/20         1;
-    188.114.96.0/20         1;
-    190.93.240.0/20         1;
-    197.234.240.0/22        1;
-    198.41.128.0/17         1;
-    199.27.128.0/21         1;
-    2400:cb00::/32          1;
-    2405:8100::/32          1;
-    2405:b500::/32          1;
-    2606:4700::/32          1;
-    2803:f800::/32          1;
-    2a06:98c0::/29          1;
-    2c0f:f248::/32          1;
-
-}
-
-map $webp_suffix_cf$webp_suffix_valid $webp_suffix {
-    default "";
-    00 ".webp";
-}
\ No newline at end of file
diff --git a/wo/cli/templates/wpcommon.mustache b/wo/cli/templates/wpcommon.mustache
index b3d8152..70cf7f1 100644
--- a/wo/cli/templates/wpcommon.mustache
+++ b/wo/cli/templates/wpcommon.mustache
@@ -45,7 +45,7 @@ location /wp-content/uploads {
         access_log off;
         log_not_found off;
         expires max;
-        try_files $uri$avif_suffix $uri$webp_suffix $uri =404;
+        try_files $uri$image_suffix $uri =404;
     }
     location ~* \.(php|gz|log|zip|tar|rar|xz)$ {
         #Prevent Direct Access Of PHP Files & Backups from Web Browsers
@@ -61,7 +61,7 @@ location /wp-content/plugins/ewww-image-optimizer/images {
         access_log off;
         log_not_found off;
         expires max;
-        try_files $uri$webp_suffix $uri =404;
+        try_files $uri$image_suffix $uri =404;
     }
     location ~ \.php$ {
     #Prevent Direct Access Of PHP Files From Web Browsers