diff --git a/docker-compose.yml b/docker-compose.yml
index 88443e52..dd5fe631 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,8 +25,8 @@ services:
       - AVATAR_URL_ROOT=/avatars
       - ADVERT_URL_ROOT=/spns
       - IMAGE_URL_ROOT=/img
-      - BADGE_URL_ROOT=/badges
-      - TAG_URL_ROOT=/tags
+      - BADGE_URL_ROOT=/badge-img
+      - TAG_URL_ROOT=/tag-img
       - ELASTICSEARCH_URL=http://elasticsearch:9200
       - REDIS_HOST=redis
       - DATABASE_URL=ecto://postgres:postgres@postgres/philomena_dev
diff --git a/docker/web/nginx.conf b/docker/web/nginx.conf
index 969cb6e1..59b80bc7 100644
--- a/docker/web/nginx.conf
+++ b/docker/web/nginx.conf
@@ -66,7 +66,7 @@ server {
 		add_header Content-Type $custom_content_type;
 	}
 
-	location ~ ^/badges/(.+) {
+	location ~ ^/badge-img/(.+) {
 		expires max;
 		add_header Cache-Control public;
 		proxy_pass http://s3/$BUCKET_NAME/badges/$1;
@@ -74,7 +74,7 @@ server {
 		add_header Content-Type $custom_content_type;
 	}
 
-	location ~ ^/tags/(.+) {
+	location ~ ^/tag-img/(.+) {
 		expires max;
 		add_header Cache-Control public;
 		proxy_pass http://s3/$BUCKET_NAME/tags/$1;