diff --git a/nginx_proxy/CHANGELOG.md b/nginx_proxy/CHANGELOG.md
index bbf96d3..60096b1 100644
--- a/nginx_proxy/CHANGELOG.md
+++ b/nginx_proxy/CHANGELOG.md
@@ -1,19 +1,29 @@
 # Changelog
 
+## 2.2
+
+- Fix issue with `homeassistant` connection
+- Update nginx to version 1.16.1
+
 ## 2.1
+
 - Update nginx to version 1.14.2
 
 ## 2.0
+
 - Update nginx to version 1.14.0
 
 ## 1.2
+
 - Modify `server_names_hash_bucket_size` to add support for longer domain names
 
 ## 1.1
+
 - Update run.sh info messages
 - Make HSTS configurable and optional
 
 ## 1.0
+
 - Add customization mechanism using included config snippets from /share
 - Optimize logo.png
 - Update base image
diff --git a/nginx_proxy/Dockerfile b/nginx_proxy/Dockerfile
index 20ed398..4b7e46d 100644
--- a/nginx_proxy/Dockerfile
+++ b/nginx_proxy/Dockerfile
@@ -1,14 +1,11 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
-# Add env
-ENV LANG C.UTF-8
-
 # Setup base
 RUN apk add --no-cache nginx openssl
 
 # Copy data
-COPY run.sh /
-COPY nginx.conf /etc/
+COPY data/run.sh /
+COPY data/nginx.conf /etc/
 
 CMD [ "/run.sh" ]
diff --git a/nginx_proxy/build.json b/nginx_proxy/build.json
new file mode 100644
index 0000000..8753c59
--- /dev/null
+++ b/nginx_proxy/build.json
@@ -0,0 +1,9 @@
+{
+  "build_from": {
+    "amd64": "homeassistant/amd64-base:3.10",
+    "i386": "homeassistant/i386-base:3.10",
+    "armhf": "homeassistant/armhf-base:3.10",
+    "armv7": "homeassistant/armv7-base:3.10",
+    "aarch64": "homeassistant/aarch64-base:3.10"
+  }
+}
diff --git a/nginx_proxy/nginx.conf b/nginx_proxy/data/nginx.conf
similarity index 96%
rename from nginx_proxy/nginx.conf
rename to nginx_proxy/data/nginx.conf
index 9fd9e31..be60e46 100644
--- a/nginx_proxy/nginx.conf
+++ b/nginx_proxy/data/nginx.conf
@@ -53,7 +53,7 @@ http {
         #include /share/nginx_proxy_default*.conf;
 
         location / {
-            proxy_pass http://homeassistant:8123;
+            proxy_pass http://homeassistant.local.hass.io:8123;
             proxy_set_header Host $host;
             proxy_redirect http:// https://;
             proxy_http_version 1.1;
diff --git a/nginx_proxy/run.sh b/nginx_proxy/data/run.sh
similarity index 100%
rename from nginx_proxy/run.sh
rename to nginx_proxy/data/run.sh