diff --git a/.env.example b/.env.example
index b2de084..251d415 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,10 @@
 POSTGRES_USER=f0ckm
 POSTGRES_DB=f0ckm
 POSTGRES_PASSWORD=f0ckm
-#VIRTUAL_HOST=example.net
-#LETSENCRYPT_HOST=example.net
-#LETSENCRYPT_EMAIL=foobar@example.net
+# --- Nginx & Let's Encrypt Configuration (Optional) ---
+# Set to 'f0ckm-nginx' to enable the Nginx & Let's Encrypt proxy stack
+# COMPOSE_PROFILES=f0ckm-nginx
+#
+# VIRTUAL_HOST=yourdomain.com
+# LETSENCRYPT_HOST=yourdomain.com
+# LETSENCRYPT_EMAIL=your-email@example.com
diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml
deleted file mode 100644
index cd0f4d0..0000000
--- a/docker-compose.nginx.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-services:
-  f0ckm:
-    image: ${f0ckm_IMAGE:-f0ckm}:${f0ckm_TAG:-latest}
-    environment:
-      - VIRTUAL_HOST=${VIRTUAL_HOST:-localhost}
-      - VIRTUAL_PORT=1337
-      - LETSENCRYPT_HOST=${LETSENCRYPT_HOST:-}
-      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL:-}
-
-  nginx-proxy:
-    image: nginxproxy/nginx-proxy:latest
-    container_name: f0ckm-nginx-proxy
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - certs:/etc/nginx/certs:rw
-      - vhost:/etc/nginx/vhost.d:rw
-      - html:/usr/share/nginx/html:rw
-      - ./config/nginx/f0ck.conf:/etc/nginx/conf.d/f0ckm.conf:ro
-    networks:
-      - f0ckm-net
-    restart: unless-stopped
-
-  acme-companion:
-    image: nginxproxy/acme-companion:latest
-    container_name: f0ckm-acme-companion
-    environment:
-      - NGINX_PROXY_CONTAINER=f0ckm-nginx-proxy
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - certs:/etc/nginx/certs:rw
-      - vhost:/etc/nginx/vhost.d:rw
-      - html:/usr/share/nginx/html:rw
-      - acme:/etc/acme.sh:rw
-    depends_on:
-      - nginx-proxy
-    networks:
-      - f0ckm-net
-    restart: unless-stopped
-
-networks:
-  f0ckm-net:
-    external: true
-    name: f0ckm_f0ckm-net
-
-volumes:
-  certs:
-  vhost:
-  html:
-  acme:
diff --git a/docker-compose.yml b/docker-compose.yml
index cecb9e3..1b22b37 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,10 @@ services:
 
     environment:
       - GIT_HASH=${f0ckm_TAG:-unknown}
+      - VIRTUAL_HOST=${VIRTUAL_HOST:-localhost}
+      - VIRTUAL_PORT=1337
+      - LETSENCRYPT_HOST=${LETSENCRYPT_HOST:-}
+      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL:-}
     ports:
       - "1337:1337"
     restart: unless-stopped
@@ -80,6 +84,49 @@ services:
   #     - f0ckm-net
   #   restart: unless-stopped
 
+  f0ckm-nginx:
+    image: nginxproxy/nginx-proxy:latest
+    container_name: f0ckm-nginx
+    profiles:
+      - f0ckm-nginx
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - certs:/etc/nginx/certs:rw
+      - vhost:/etc/nginx/vhost.d:rw
+      - html:/usr/share/nginx/html:rw
+      - ./config/nginx/f0ck.conf:/etc/nginx/conf.d/f0ckm.conf:ro
+    networks:
+      - f0ckm-net
+    restart: unless-stopped
+
+  acme-companion:
+    image: nginxproxy/acme-companion:latest
+    container_name: f0ckm-acme-companion
+    profiles:
+      - f0ckm-nginx
+    environment:
+      - NGINX_PROXY_CONTAINER=f0ckm-nginx
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - certs:/etc/nginx/certs:rw
+      - vhost:/etc/nginx/vhost.d:rw
+      - html:/usr/share/nginx/html:rw
+      - acme:/etc/acme.sh:rw
+    depends_on:
+      - f0ckm-nginx
+    networks:
+      - f0ckm-net
+    restart: unless-stopped
+
 networks:
   f0ckm-net:
     driver: bridge
+
+volumes:
+  certs:
+  vhost:
+  html:
+  acme: