diff --git a/docker-compose/docker-compose.prod.yml b/docker-compose/docker-compose.prod.yml
index 07655efd8..9547e10df 100644
--- a/docker-compose/docker-compose.prod.yml
+++ b/docker-compose/docker-compose.prod.yml
@@ -6,8 +6,6 @@ services:
   reverse-proxy:
     ports:
       - "443:443"
-    depends_on:
-      - web
     volumes:
       - ./reverse-proxy/server-includes:/etc/nginx/server-includes:ro
       - ./reverse-proxy/location-includes:/etc/nginx/location-includes:ro
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 67db63708..546eeb33d 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -6,8 +6,6 @@ services:
     restart: always
     networks:
       - reverse-proxy
-    depends_on:
-      - directory-api
 
   api-docs:
     image: swaggerapi/swagger-ui:latest
diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf
index 94ed15b02..46d89394a 100644
--- a/reverse-proxy/conf.d.dev/default.conf
+++ b/reverse-proxy/conf.d.dev/default.conf
@@ -2,23 +2,29 @@ server {
   listen 80 default_server;
   include server-includes/*;
 
-  # location ^~ /api/archival/ {
-  #   rewrite    ^/api/archival/(.*)$ /$1 break;
-  #   proxy_pass http://archival-api:80;
-  #   include    location-includes/*;
-  #   add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always;
-  # }
+  location ^~ /api/archival/ {
+    rewrite    ^/api/archival/(.*)$ /$1 break;
+    resolver 127.0.0.11 valid=30s;
+    set $archival-api archival-api;
+    proxy_pass http://$archival-api:80;
+    include    location-includes/*;
+    add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always;
+  }
 
   location ^~ /api/directory/ {
     rewrite    ^/api/directory/(.*)$ /$1 break;
-    proxy_pass http://directory-api:80;
+    resolver 127.0.0.11 valid=30s;
+    set $directory-api directory-api;
+    proxy_pass http://$directory-api:80;
     include    location-includes/*;
     add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always;
   }
 
   location ^~ /api/ {
     rewrite    ^/api/(.*)$ /$1 break;
-    proxy_pass http://api-docs:8080;
+    resolver 127.0.0.11 valid=30s;
+    set $api-docs api-docs;
+    proxy_pass http://$api-docs:8080;
     include    location-includes/*;
     add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none'; connect-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' validator.swagger.io data:;" always;
   }
diff --git a/reverse-proxy/conf.d/default.conf b/reverse-proxy/conf.d/default.conf
index be3fd899e..249db675c 100644
--- a/reverse-proxy/conf.d/default.conf
+++ b/reverse-proxy/conf.d/default.conf
@@ -5,29 +5,37 @@ server {
   ssl_certificate /etc/nginx/cert/filterlists_cert.pem;
   ssl_certificate_key /etc/nginx/cert/filterlists_key.pem;
   
-  # location ^~ /api/archival/ {
-  #   rewrite    ^/api/archival/(.*)$ /$1 break;
-  #   proxy_pass http://archival-api:80;
-  #   include    location-includes/*;
-  #   add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always;
-  # }
+  location ^~ /api/archival/ {
+    rewrite    ^/api/archival/(.*)$ /$1 break;
+    resolver 127.0.0.11 valid=30s;
+    set $archival-api archival-api;
+    proxy_pass http://$archival-api:80;
+    include    location-includes/*;
+    add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always;
+  }
 
   location ^~ /api/directory/ {
     rewrite    ^/api/directory/(.*)$ /$1 break;
-    proxy_pass http://directory-api:80;
+    resolver 127.0.0.11 valid=30s;
+    set $directory-api directory-api;
+    proxy_pass http://$directory-api:80;
     include    location-includes/*;
     add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always;
   }
 
   location ^~ /api/ {
     rewrite    ^/api/(.*)$ /$1 break;
-    proxy_pass http://api-docs:8080;
+    resolver 127.0.0.11 valid=30s;
+    set $api-docs api-docs;
+    proxy_pass http://$api-docs:8080;
     include    location-includes/*;
     add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none'; connect-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' validator.swagger.io data:;" always;
   }
 
   location / {
-    proxy_pass http://web:80;
+    resolver 127.0.0.11 valid=30s;
+    set $web web;
+    proxy_pass http://$web:80;
     include    location-includes/*;
     add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none'; connect-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; manifest-src 'self';" always;
   }