diff --git a/conf.d/pocketapp.conf b/conf.d/pocketapp.conf
new file mode 100644
index 0000000..b43abd0
--- /dev/null
+++ b/conf.d/pocketapp.conf
@@ -0,0 +1,23 @@
+server {
+    listen 80;
+    server_name pocket.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name pocket.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key;
+
+    location / {
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_pass http://pocketapp:4200;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
\ No newline at end of file
diff --git a/conf.d/psitrail.conf b/conf.d/psitrail.conf
new file mode 100644
index 0000000..c9104b5
--- /dev/null
+++ b/conf.d/psitrail.conf
@@ -0,0 +1,23 @@
+server {
+    listen 80;
+    server_name psitrail.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name psitrail.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key;
+
+    location / {
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_pass http://psitrail:4200;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c25291d..5b5e7fb 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -431,6 +431,27 @@ services:
     networks:
       - leaps_db
 
+  # Noah Pombas Teixeira De Freitas /  <noah.pombas@psi.ch>
+  # PSI Trail - psitrail.psi.ch
+  # Image: gitea.psi.ch/bb_if_produktiv/psitrail:181
+  psitrail:
+    image: gitea.psi.ch/bb_if_produktiv/psitrail:181
+    container_name: psitrail
+    restart: always
+    networks:
+      - backend
+
+  # Noah Pombas Teixeira De Freitas /  <noah.pombas@psi.ch>
+  # Pocket App - pocket.psi.ch
+  # Image: gitea.psi.ch/bb_if_produktiv/pocketapp:17
+  pocketapp:
+    image: gitea.psi.ch/bb_if_produktiv/pocketapp:17
+    container_name: pocketapp
+    restart: always
+    networks:
+      - backend
+    
+
 #   # João Pedro Agostinho de Sousa <joao.agostinho-de-sousa@psi.ch>
 #   # tubulin.xyz
 #   neo4j: