diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 5b04ac3..30e221f 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -1,9 +1,5 @@
 ---
-version: "3"
-networks:
-  gitea:
-    external: false
-    
+version: "2.1"
 services:
   gitea:
     image: gitea/gitea:latest
@@ -11,8 +7,6 @@ services:
     environment:
       - USER_UID=1000
       - USER_GID=1000
-    networks:
-      - gitea  
     volumes:
       - ./data:/data
       - /etc/timezone:/etc/timezone:ro
@@ -20,6 +14,5 @@ services:
     ports:
       - "8300:3000"
       - "222:22"
-    restart: unless-stopped  
-    
+    restart: unless-stopped
 
diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml
new file mode 100644
index 0000000..31648bb
--- /dev/null
+++ b/pihole/docker-compose.yml
@@ -0,0 +1,24 @@
+version: "3"
+
+# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
+services:
+  pihole:
+    container_name: pihole
+    image: pihole/pihole:latest
+    ports:
+      - "53:53/tcp"
+      - "53:53/udp"
+      - "67:67/udp"
+      - "80:80/tcp"
+    environment:
+      TZ: 'Europe/London'
+      WEBPASSWORD: '2twN2nwWyvEEm2L'
+    # Volumes store your data between container upgrades
+    volumes:
+      - './etc-pihole/:/etc/pihole/'
+      - './etc-dnsmasq.d/:/etc/dnsmasq.d/'
+    # Recommended but not required (DHCP needs NET_ADMIN)
+    #   https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
+    cap_add:
+      - NET_ADMIN
+    restart: unless-stopped
\ No newline at end of file
diff --git a/pihole/etc-dnsmasq.d/.gitignore b/pihole/etc-dnsmasq.d/.gitignore
new file mode 100644
index 0000000..1e04ba0
--- /dev/null
+++ b/pihole/etc-dnsmasq.d/.gitignore
@@ -0,0 +1,8 @@
+# .gitignore sample
+###################
+
+# Ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore
diff --git a/pihole/etc-pihole/.gitignore b/pihole/etc-pihole/.gitignore
new file mode 100644
index 0000000..1e04ba0
--- /dev/null
+++ b/pihole/etc-pihole/.gitignore
@@ -0,0 +1,8 @@
+# .gitignore sample
+###################
+
+# Ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore
diff --git a/pihole/readme.md b/pihole/readme.md
new file mode 100644
index 0000000..1ac9165
--- /dev/null
+++ b/pihole/readme.md
@@ -0,0 +1,3 @@
+# Pi Hole
+
+Text