diff --git a/bin/proxy/armv7l/Dockerfile b/bin/proxy/armv7l/Dockerfile
index ec3b399..8da0568 100644
--- a/bin/proxy/armv7l/Dockerfile
+++ b/bin/proxy/armv7l/Dockerfile
@@ -1,3 +1,7 @@
+# Newest version now supports multi-arch builds.
+# FROM jwilder/nginx-proxy:latest
+
+# Testing specific PR of NGINX_PROXY_VERSION w/ branch for supporting path based routing
 FROM arm32v7/nginx 
 
 LABEL maintainer="Paulo Truta paulo@edgebox.io"
@@ -23,12 +27,15 @@ RUN wget https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-arm.tgz \
  && rm forego-stable-linux-arm.tgz
 
 # Install docker-gen
-RUN wget https://github.com/jwilder/docker-gen/releases/download/0.7.4/docker-gen-linux-armhf-0.7.4.tar.gz \
- && tar -C /usr/local/bin -xvzf docker-gen-linux-armhf-0.7.4.tar.gz \
- && rm docker-gen-linux-armhf-0.7.4.tar.gz
+# RUN wget https://github.com/jwilder/docker-gen/releases/download/0.7.4/docker-gen-linux-armhf-0.7.4.tar.gz \
+#  && tar -C /usr/local/bin -xvzf docker-gen-linux-armhf-0.7.4.tar.gz \
+#  && rm docker-gen-linux-armhf-0.7.4.tar.gz
+
+# Install custom build of docker-gen
+COPY ./docker-gen /usr/local/bin/docker-gen
 
-ENV NGINX_PROXY_VERSION "0.6.0"
-RUN git clone --branch ${NGINX_PROXY_VERSION} https://github.com/jwilder/nginx-proxy.git /app
+ENV NGINX_PROXY_VERSION "main"
+RUN git clone --branch ${NGINX_PROXY_VERSION} https://github.com/AlexanderLieret/nginx-proxy /app
 
 WORKDIR /app/
 
diff --git a/bin/proxy/armv7l/Dockerfile_new b/bin/proxy/armv7l/Dockerfile_new
new file mode 100644
index 0000000..505db41
--- /dev/null
+++ b/bin/proxy/armv7l/Dockerfile_new
@@ -0,0 +1,3 @@
+# Newest version supports armv7l and other architectures. No more need to have a custom Dockerfile
+
+FROM jwilder/nginx-proxy:latest
diff --git a/bin/proxy/armv7l/docker-gen b/bin/proxy/armv7l/docker-gen
new file mode 100755
index 0000000..25523b7
Binary files /dev/null and b/bin/proxy/armv7l/docker-gen differ