diff --git a/nifi/docker-compose.yml b/nifi/docker-compose.yml
index afb6945..abd2f1d 100644
--- a/nifi/docker-compose.yml
+++ b/nifi/docker-compose.yml
@@ -5,7 +5,7 @@
 services:
 
   init-nifi:
-    image: apache/nifi:2.3.0
+    image: apache/nifi:2.4.0
     entrypoint: ["bash", "-c"]
     command: ["test -f /tmp/bootstrap.conf || cp -v /opt/nifi/nifi-current/conf/* /tmp"]
     volumes:
@@ -13,7 +13,7 @@ services:
       - ./data/nifi/conf:/tmp
 
   nifi:
-    image: apache/nifi:2.3.0
+    image: apache/nifi:2.4.0
     ports:
       - "8443:8443"
     volumes:
@@ -39,7 +39,7 @@ services:
     restart: unless-stopped
 
   registry:
-    image: apache/nifi-registry:2.3.0
+    image: apache/nifi-registry:2.4.0
     ports:
       - "18080:18080"
     volumes:
diff --git a/nifi/nginx.conf b/nifi/nginx.conf
index acecbc0..073d881 100644
--- a/nifi/nginx.conf
+++ b/nifi/nginx.conf
@@ -12,18 +12,20 @@ server {
     ssl_protocols        TLSv1 TLSv1.1 TLSv1.2;
     ssl_ciphers          HIGH:!aNULL:!MD5;
     location / {
-        proxy_set_header X-ProxyScheme https;
-        proxy_set_header X-ProxyHost $host;
-        proxy_set_header X-ProxyPort 443;
-        proxy_set_header X-ProxyContextPath "";
-        proxy_pass       http://127.0.0.1:8080;
+        proxy_set_header     X-ProxyScheme https;
+        proxy_set_header     X-ProxyHost $host;
+        proxy_set_header     X-ProxyPort 443;
+        proxy_set_header     X-ProxyContextPath "";
+        proxy_set_header     Host nifi;
+        proxy_ssl_verify     off;
+        proxy_ssl_protocols  TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+        proxy_pass           https://172.16.1.9:8443;
     }
     location /nifi-registry {
-        proxy_set_header Origin http://172.16.1.9:18080;
-        proxy_set_header X-ProxyScheme https;
-        proxy_set_header X-ProxyHost $host;
-        proxy_set_header X-ProxyPort 443;
-        proxy_set_header X-ProxyContextPath "";
-        proxy_pass       http://127.0.0.1:18080;
+        proxy_set_header     X-ProxyScheme https;
+        proxy_set_header     X-ProxyHost $host;
+        proxy_set_header     X-ProxyPort 443;
+        proxy_set_header     X-ProxyContextPath "";
+        proxy_pass           http://127.0.0.1:18080;
     }
 }