diff --git a/lamp/docker-compose.yml b/lamp/docker-compose.yml
deleted file mode 100644
index af3527c..0000000
--- a/lamp/docker-compose.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-################################################################################
-# Joomla
-# Update the .env file
-#
-# Version 1
-################################################################################
-version: '3.3'
-
-volumes:
-  mariadb:
-  joomla:
-
-networks:
-  admin_web:
-    external:
-      name: admin_web
-
-services:
-
-  mariadb:
-    image: mariadb:${LAMPDB_V}
-    restart: always
-    volumes:
-      - mariadb:/var/lib/mysql
-    networks:
-      - admin_web
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_USER: joomla
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_DATABASE: joomla
-
-  memcached:
-    image: memcached:${MEM_V}
-    restart: always
-    networks:
-      - admin_web
-
-  lamp:
-    image: nick/ubuntu-apache-php:latest
-    restart: always
-    links:
-      - mariadb
-    networks:
-      - admin_web
-    volumes:
-      - joomla:/var/www/html
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${PREFIX}_lamp.rule=Host(`${DOMAIN_NAME}`)"
-      - "traefik.http.routers.${PREFIX}_lamp.entrypoints=websecure"
-      - "traefik.http.routers.${PREFIX}_lamp.tls.certresolver=letsencrypt"
-      - "traefik.http.services.${PREFIX}_lamp.loadbalancer.server.port=80"
diff --git a/lamp/env-sample b/lamp/env-sample
deleted file mode 100644
index e0b0469..0000000
--- a/lamp/env-sample
+++ /dev/null
@@ -1,15 +0,0 @@
-# docker-compose -p <PREFIX>  up -d
-
-# Domains & Project
-PREFIX=p1
-DOMAIN_NAME=p1.nickyeoman.com
-
-# PASSWORDS
-MYSQL_PASSWORD=8YDmMw4ePRvBc2Z2
-MYSQL_ROOT_PASSWORD=5XLvbJ76r3yKREw8
-
-# Software versions
-# https://hub.docker.com/_/mariadb
-LAMPDB_V=10.4.12
-# https://hub.docker.com/_/memcached/
-MEM_V=1.6.5
diff --git a/lap/docker-compose.yml b/lap/docker-compose.yml
deleted file mode 100644
index 19a3c6f..0000000
--- a/lap/docker-compose.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-# Joomla
-# Update the .env file
-#
-# Version 1
-################################################################################
-version: '3.3'
-
-volumes:
-  lap:
-
-networks:
-  admin_web:
-    external:
-      name: admin_web
-
-services:
-
-  lap:
-    image: nick/ubuntu-apache-php:latest
-    restart: always
-    networks:
-      - admin_web
-    volumes:
-      - lap:/var/www/html
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${PREFIX}_lap.rule=Host(`${DOMAIN_NAME}`)"
-      - "traefik.http.routers.${PREFIX}_lap.entrypoints=websecure"
-      - "traefik.http.routers.${PREFIX}_lap.tls.certresolver=letsencrypt"
-      - "traefik.http.services.${PREFIX}_lap.loadbalancer.server.port=80"
diff --git a/lap/env-sample b/lap/env-sample
deleted file mode 100644
index 2058e91..0000000
--- a/lap/env-sample
+++ /dev/null
@@ -1,5 +0,0 @@
-# docker-compose -p <PREFIX>  up -d
-
-# Domains & Project
-PREFIX=p1
-DOMAIN_NAME=p1.nickyeoman.com
diff --git a/matomo/docker-compose.yml b/matomo/docker-compose.yml
index 6ef64c0..68d0dc2 100644
--- a/matomo/docker-compose.yml
+++ b/matomo/docker-compose.yml
@@ -1,21 +1,19 @@
 ################################################################################
 # matomo
 #
-# Version 1
+# Sample .env
 #
+# MATOMO_MYSQL_ROOT_PASSWORD=ChangeRootPass
+# MATOMO_MYSQL_PASSWORD=ChangeThisPassword
+# NETWORKNAME=admin_web
+# DB_V=11.3.2
 ################################################################################
-version: '3.3'
-
-volumes:
-  matomodb:
-  matomo:
-  matomoconfig:
-  matomologs:
+version: '3.8'
 
 networks:
-  admin_web:
+  default:
     external:
-      name: admin_web
+      name: ${NETWORKNAME:-default} 
 
 services:
 
@@ -23,9 +21,7 @@ services:
     image: mariadb:${DB_V}
     restart: always
     volumes:
-      - matomodb:/var/lib/mysql
-    networks:
-      - admin_web
+      - ./data/matomodb:/var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: ${MATOMO_MYSQL_ROOT_PASSWORD}
       MYSQL_PASSWORD: ${MATOMO_MYSQL_PASSWORD}
@@ -36,15 +32,7 @@ services:
   matomo:
     image: matomo:${MATOMO_V}
     volumes:
-      - matomo:/var/www/html
-      - matomoconfig:/var/www/html/config
-      - matomologs:/var/www/html/logs
-    networks:
-      - admin_web
+      - ./data/matomo:/var/www/html
+      - ./data/matomoconfig:/var/www/html/config
+      - ./data/matomologs:/var/www/html/logs
     restart: always
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${PREFIX}_matomo.rule=Host(`${MATOMO_DOMAIN_NAME}`)"
-      - "traefik.http.routers.${PREFIX}_matomo.entrypoints=websecure"
-      - "traefik.http.routers.${PREFIX}_matomo.tls.certresolver=letsencrypt"
-      - "traefik.http.services.${PREFIX}_matomo.loadbalancer.server.port=80"