diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54e0b37..40b0fd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.17.3 2022-03-04 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Move upstream blocks to dedicated section to nginx.conf as opposed to default.conf
+
+
 ## 5.17.2 2022-03-02 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/install/etc/cont-init.d/10-nginx b/install/etc/cont-init.d/10-nginx
index 301b156..fad31c4 100755
--- a/install/etc/cont-init.d/10-nginx
+++ b/install/etc/cont-init.d/10-nginx
@@ -346,8 +346,8 @@ EOF
         echo "    server $host${llng_handler_listen_port} ${NGINX_UPSTREAM_OPTIONS};" >> /etc/nginx/nginx.conf.d/authentication/llng_upstream
     done
     echo "}" >> /etc/nginx/nginx.conf.d/authentication/llng_upstream
-    sed -i -e "/ server {/i### LLNG Authentication Multiple Handlers configuration" /etc/nginx/conf.d/default.conf
-    sed -i -e "/ server {/i\include \/etc\/nginx\/nginx.conf.d\/authentication\/llng_upstream;" /etc/nginx/conf.d/default.conf
+    sed -i -e "/# Do not delete - Upstream Configuration/a\ \ \ \ include \/etc\/nginx\/nginx.conf.d\/authentication\/llng_upstream;" /etc/nginx/nginx.conf
+    sed -i -e "/# Do not delete - Upstream Configuration/a\ \ \ \ ### LLNG Authentication Multiple Handlers configuration" /etc/nginx/nginx.conf
     sed -i "s#<LLNG_HANDLER_PORT>#$NGINX_AUTHENTICATION_LLNG_HANDLER_PORT#g" /etc/nginx/nginx.conf.d/authentication/llng_location_block
 
     if [ ! -f "/etc/cont-init.d/20-php-fpm" ]; then
diff --git a/install/etc/nginx/nginx.conf b/install/etc/nginx/nginx.conf
index 16be8fa..0bb1a87 100644
--- a/install/etc/nginx/nginx.conf
+++ b/install/etc/nginx/nginx.conf
@@ -43,5 +43,8 @@ http {
     include /etc/nginx/nginx.conf.d/compression_gzip.conf;
     include /etc/nginx/nginx.conf.d/compression_brotli.conf;
     include /etc/nginx/nginx.conf.d/monitoring.conf;
+
+    # Do not delete - Upstream Configuration
+
     include /etc/nginx/conf.d/*.conf;
 }