diff --git a/docker-compose.yml b/docker-compose.yml
index e69e242..0f350db 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,8 @@ services:
       - REMOTE_PROXY_PASS=http://guacamole:8080/guacamole/
       - DRONE_PROXY_PASS=http://drone-server:8080
       - REGISTRY_PROXY_PASS=http://registry-1:5000
+      - PORTAINER_PROXY_PASS=http://portainer:8000
+      - PORTAINER_LOCATION=/portainer/
       - GIT_LOCATION=/git/
       - BLOG_LOCATION=/
       - CHAT_LOCATION=/chat/
@@ -353,12 +355,9 @@ services:
         constraints: [node.role == manager]
       restart_policy:
         condition: any
-    ports:
-      - 9000:9000
-      - 8000:8000
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - portainer_data:/data
+      - portainer-data:/data
     networks:
       #- proxy
       - appnet
@@ -393,6 +392,7 @@ volumes:
   ghost-content:
   mongo-chat:
   chat-uploads:
+  portainer-data:
 
 networks:
   appnet:
diff --git a/letsencrypt-nginx/conf/git.conf b/letsencrypt-nginx/conf/git.conf
index b6da90f..234f0ac 100644
--- a/letsencrypt-nginx/conf/git.conf
+++ b/letsencrypt-nginx/conf/git.conf
@@ -129,6 +129,14 @@
                 proxy_buffering off;
                 proxy_pass ${BLOG_PROXY_PASS};
         }
+        location ${PORTAINER_LOCATION} {
+                proxy_set_header Host ${DOLLAR}http_host;
+                proxy_set_header X-Real-IP ${DOLLAR}remote_addr;
+                proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme;
+                proxy_buffering off;
+                proxy_pass ${PORTAINER_PROXY_PASS};
+        }
 
         location ${CHAT_LOCATION}sockjs {
           proxy_pass ${CHAT_PROXY_PASS}/chat/sockjs;
@@ -182,7 +190,7 @@
            proxy_redirect off;
 
         }
-                location ${REMOTE_LOCATION}websocket-tunnel/ {
+        location ${REMOTE_LOCATION}websocket-tunnel/ {
           proxy_pass ${REMOTE_PROXY_PASS}websocket-tunnel/;
           proxy_http_version 1.1;
           proxy_set_header Upgrade ${DOLLAR}http_upgrade;