diff --git a/README.md b/README.md
index b9b2dff..8b4f963 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,19 @@
 ## Overview
 
 Available on Dockerhub: 
-[10up/phpfpm](https://hub.docker.com/r/10up/phpfpm/)
+[10up/nginx-proxy](https://hub.docker.com/r/10up/nginx-proxy/)
 [10up/wpsnapshots](https://hub.docker.com/r/10up/wpsnapshots)
+[10up/phpfpm](https://hub.docker.com/r/10up/phpfpm/) - deprecated, do not use
+
+## Building
+
+In each directory you can issue:
+
+`docker build . -t <your tag>`
+
+If you want to build a multiarch version (currently only nginx-proxy supports this) you might run:
+
+`docker buildx build . -t <your tag> --platform linux/amd64,linux/arm64`
 
 ## Support Level
 
diff --git a/nginx-proxy/Dockerfile b/nginx-proxy/Dockerfile
index 1e08ce4..8a1d347 100644
--- a/nginx-proxy/Dockerfile
+++ b/nginx-proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM jwilder/nginx-proxy:0.7.0
+FROM nginxproxy/nginx-proxy:latest
 
 COPY certs/ /etc/nginx/certs
 COPY nginx.tmpl /app/nginx.tmpl
diff --git a/nginx-proxy/certs/default.crt b/nginx-proxy/certs/default.crt
index 2116b54..700fa73 100644
--- a/nginx-proxy/certs/default.crt
+++ b/nginx-proxy/certs/default.crt
@@ -1,17 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICsjCCAhugAwIBAgIJAK9HXB0+bKUaMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwIBcNMTcwNjI3MTkwMTE2WhgPMjA4NTA3MTUxOTAxMTZa
-MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJ
-bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALvW04ukqYNjqoG70UM3RDlPVYtExJAUapDDuxYm6j861/LPPPFjFOT3XygC
-WDRGJAQuSx+SSU8tD+scsZwl1sKppLX19BbnDAWxXVuCoxD7CdL+HORQ/oYCWVn8
-6L1Nucn41NkCytz/lVMYYIu0U3Jpib7XvV2sRgVvS9byjT9xAgMBAAGjgacwgaQw
-HQYDVR0OBBYEFJWQDkQ3kfZNEFvRd7JT3frl0fjSMHUGA1UdIwRuMGyAFJWQDkQ3
-kfZNEFvRd7JT3frl0fjSoUmkRzBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29t
-ZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkggkAr0dc
-HT5spRowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAt8ASJ/0zYHOIp
-WBOKSbammIFLnh/2Mttosi/HWpmr0+5GMN7yAPZKadK8XHbg1D4zw7YaJ18EBIcu
-Fp9+Dvs/uyvzG9Q4oJWt4eYTY4uu8GYv0jaQnBmybQZfrkf8VLSCPZ0SPVc1+vBs
-Fsm4eOUWHCfe11QxWE/b6q2zwUqULQ==
+MIIFJDCCAwwCCQDZL1L6DknDxjANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UEBwwYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMQ0wCwYDVQQKDAQxMHVwMB4XDTIxMDUwNTIxNDYzMVoXDTMxMDUw
+MzIxNDYzMVowVDELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAf
+BgNVBAcMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDENMAsGA1UECgwEMTB1cDCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMIrvTxG9pQY4nHRRBLCr4Cw
+xWnfYEcihqv9PPCl7XdmjozgfKIBa9w9Xl+pkbwIGW4WeTXrJT3+QWNLz+4r14y8
+kq4vmjxTUg4bnnQMSrQuxkQrHk0VJh+wFo0XGCSxVkA88Z8tKGHgtMJkQayJlU+8
+4Jc3cjNf1d57CfKnPDIVDR8AOxQQFjbjNlT3469pLOfZs8cN+TBLZ/Fpk67vJ26G
+fnF8lfqodMr7/06gWJySBetxAYCiXeWqfrGkObmOW/QRjZeNYrXtt9F5sGcS5bsk
+3KnTejUx35/uhNXMvoF1A3yhP2HyZpNEu+rXKmwvsm2K0x5R6tW/Z2EE91l4xQx7
+jJcGB1MPJZTOLf4znx/5UwUPoKmfEzdZwZaLAUDehomR3f84YjOwp9xrYwmE1t33
+hyub4nu85bGInwXUe5FVmn0OYgbpUG0GEQMtVH2VOddSJlN+fSHhh1Gws5ZCqBMk
+GYZVwF3DGzLgKjGnQ3kcvpVJ3JpKkqrLh8Fx0pYkerKp48lmUyCXqw5jxDKf+rLo
+jEWo+jwdRlH9kDoYcz5ZXjXQyEwmq2q7vrKOKRgOjpbSqwPFH2ePjmILsXscItW9
+Vw7FC0ZeeH+wd8T62MjXk3H0Q31qadmtzel6L/qd7Pb2TvbPbrJB+ZdPWPdw5qZ0
+FP0Rv4nj+hsOYJegW4CzAgMBAAEwDQYJKoZIhvcNAQELBQADggIBACnR1zHU6wQz
+/4styj/J6u6MBqyf2VTjNYrKMVVqU1hbQyZ/jLuWSWDC5M26w1acVA0hoUwZqstE
+9WdzPg5JfIPqz9+QdBY/VWQ+Pay6K9DMqZaqGWlvmvtnTsqL9kRzYFXGW2en/UJH
+QbJJO8dh+A0uFKahiaGjJEl/DxRcQiZYbI2yI29W+i/1UZ1+Uz+Kx2MUxuNtOM5F
+91pMCZhwqo0mR2pk3wXkM/hAoiQfddXr2XJjYeicioQ1Q/2glNp3xfaZyl93uaVz
+bOoSPX2t/K4OWVlzoNtOtp5ilU17x//TwHj6zMjm0Oj1uDLtm0zGxU28ZsMLWbbK
+zvaB3Z7xBVQ/P9ia8e3Q5aZnw2t4hRZQnkOtjtNnKuNqrkX8bVjnZl/c6lUE3C1U
+eZLeDDb5azYov5wIPXwQbYdtrX0+UqHhqhuWJDgsNMQ2rKSTGvppnf4A2qOfPBNw
+zH0rNDO8n9Zc2uvD9BvF6V8jmklwEu7xbx9TAex1FQD+pJxEj2JuqPtLZ+5Xdqwy
+AOCTYdE4RlBD4FUn7BSb6i+BP11zHAZTIEyILyt920mZKXIaTZWOPYLIGWRKijW+
+uKY9wbA0BpnDs2Hh0deRxwh/4IdpixW6SS8Wcrek1CWBy3Ixz1Y6EjRwE5FZW+8W
+vKGq6jz4NNdSknJXNQjF1NTyF56GzWzk
 -----END CERTIFICATE-----
diff --git a/nginx-proxy/certs/default.key b/nginx-proxy/certs/default.key
index 7e5c337..d45b1a5 100644
--- a/nginx-proxy/certs/default.key
+++ b/nginx-proxy/certs/default.key
@@ -1,15 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----