diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7b66a6d..88f90d5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -359,6 +359,116 @@ services:
     depends_on:
       - gitdb
 
+
+      
+#############################################################################
+#####################		Pihole			#####################
+#############################################################################   
+  pihole:
+    container_name: pihole
+    image: pihole/pihole:latest
+    # For DHCP it is recommended to remove these ports and instead add: network_mode: "host"
+    ports:
+      - "53:53/tcp"
+      - "53:53/udp"
+      - "67:67/udp" # Only required if you are using Pi-hole as your DHCP server
+      - "8022:80/tcp"
+    environment:
+      TZ: 'Europe/Berlin'
+      WEBPASSWORD: ${PIHOLE_PW}
+    # Volumes store your data between container upgrades
+    volumes:
+      - './volumes/pihole-etc:/etc/pihole'
+      - './volumes/pihole-etc-dnsmasq.d:/etc/dnsmasq.d'
+    #   https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
+#    cap_add:
+   #   - NET_ADMIN # Required if you are using Pi-hole as your DHCP server, else not needed
+    restart: unless-stopped
+
+      
+#############################################################################
+#####################		Grocy			#####################
+#############################################################################      
+
+#   grocy-frontend:
+#     container_name: grocy-frontend
+#     image: grocy/frontend:v3.3.2
+#     # build:
+#     #   args:
+#     #     GROCY_VERSION: v3.3.2
+#     #     PLATFORM: linux/amd64
+#     #   context: .
+#     #   dockerfile: Containerfile-frontend
+#     depends_on:
+#       - backend
+# #    ports:
+# #      - "8888:80"      
+#     networks:
+#       - dockernet
+#       - default
+#     read_only: true
+#     volumes:
+#       - ./volumes/grocy:/var/www/data
+#     tmpfs:
+#       - /tmp
+#     restart: unless-stopped
+#     labels:
+#       - 'traefik.enable=true'
+#       - 'traefik.http.routers.grocy.rule=Host(`grocy.gerle.duckdns.org`)'
+# #      - 'traefik.http.services.grocy.loadbalancer.server.port=8888'    
+#       - "traefik.http.routers.grocy.entrypoints=websecure"
+#       - "traefik.http.routers.grocy.tls.certResolver=letsencrypt"
+
+#   backend:
+#     container_name: grocy-backend
+#     image: grocy/backend:v3.3.2
+#     expose:
+#       - '9000'
+#     read_only: true
+#     networks:
+#   #    - dockernet
+#       - default
+#     tmpfs:
+#       - /tmp
+#     volumes:
+#       - ./volumes/grocy:/var/www/data
+#     environment:
+# #      - GROCY_MODE=production
+#       - GROCY_CULTURE=de
+#       - MAX_UPLOAD=50M
+#       - PHP_MAX_FILE_UPLOAD=200
+#       - PHP_MAX_POST=100M
+#       - PHP_MEMORY_LIMIT=512M
+#       - GROCY_CURRENCY=EUR
+#     restart: unless-stopped
+
+
+    
+  grocy:
+    image: lscr.io/linuxserver/grocy:latest
+    container_name: grocy
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+      - GROCY_CURRENCY=EUR
+      - GROCY_CULTURE=de
+    volumes:
+      - ./volumes/grocy:/config
+#    ports:
+#      - 9283:80
+    restart: unless-stopped
+    networks:
+      - gitea
+      - dockernet
+    labels:
+      - 'traefik.enable=true'
+      - 'traefik.http.routers.grocy.rule=Host(`grocy.gerle.duckdns.org`)'      
+      - "traefik.http.routers.grocy.entrypoints=websecure"
+      - "traefik.http.routers.grocy.tls.certResolver=letsencrypt"
+      - "traefik.http.routers.grocy.tls=true"
+      - 'traefik.http.services.grocy.loadbalancer.server.port=80'
+      
 #############################################################################
 #####################		Networks		#####################
 #############################################################################