diff --git a/data_handling/docker-compose.yml b/data_handling/docker-compose.yml
index 3233c60..d51e97f 100644
--- a/data_handling/docker-compose.yml
+++ b/data_handling/docker-compose.yml
@@ -2,6 +2,32 @@
 version: '3'
 
 services:
+  gitea:
+    image: gitea/gitea:1.9.3
+    container_name: gitea
+    networks:
+      - backend
+    restart: always
+    environment:
+      - USER_UID=1001
+      - USER_GID=1005
+    volumes:
+      #- /var/lib/gitea:/data
+      - ${DIR}/gitea:/data
+      - /home/git/.ssh:/data/git/.ssh
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "127.0.0.1:2222:22"
+      - "3000:3000"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.gitea-service.loadbalancer.server.port=3000"
+      - "traefik.http.routers.gitea-secure.entrypoints=web-secure"
+      - "traefik.http.routers.gitea-secure.rule=Host(`gitea.${DOMAIN}`)"
+      - "traefik.http.routers.gitea-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.gitea-secure.tls=true"
+
   grafana:
     image: grafana/grafana
     container_name: grafana
@@ -18,7 +44,7 @@ services:
       - "traefik.http.services.grafana-service.loadbalancer.server.port=3000"
 
   influx:
-    image: quay.io/influxdb/influxdb:2.0.0-beta
+    image: influxdb
     container_name: influxdb
     networks:
       - backend
@@ -29,8 +55,15 @@ services:
       - "traefik.http.routers.influx.rule=host(`influx.${DOMAIN}`)"
       - "traefik.http.services.influx-service.loadBalancer.server.port=8086"
     restart: always
+    volumes:
+      - ${DIR}/influx-data:/var/lib/influxdb
     environment:
-      - INFLUX_TOKEN=-I2TAAlmXdJ06yMw9wf-Mztf83ZzYZUdE8Ov2hMrnYabvXUnxL2cZfDzNHR6LTbW7ND5rE95CdvV2-Cy8IMHZQ==
+      - INFLUXDB_DB=SOME_DB_NAME # set any other to create database on initialization
+      - INFLUXDB_HTTP_ENABLED=true
+      - INFLUXDB_HTTP_AUTH_ENABLED=true
+
+      - INFLUXDB_ADMIN_USER=SECURE_USERNAME
+      - INFLUXDB_ADMIN_PASSWORD=SECURE_PASS
 
   telegraf:
     container_name: telegraf
@@ -40,8 +73,6 @@ services:
       - backend
     ports:
       - 8081:8081
-    environment:
-      - INFLUX_TOKEN=-I2TAAlmXdJ06yMw9wf-Mztf83ZzYZUdE8Ov2hMrnYabvXUnxL2cZfDzNHR6LTbW7ND5rE95CdvV2-Cy8IMHZQ==
     volumes:
       - ./telegraf.conf:/etc/telegraf/telegraf.conf
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/docker-compose.yml b/docker-compose.yml
index d5a08ea..dee4f9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,41 +55,6 @@ services:
       - GID=1000
       - TZ=Europe/Stockholm
 
-  grafana:
-    image: grafana/grafana:6.4.2
-    container_name: grafana
-    networks:
-      - backend
-    volumes:
-      # Data persistency
-      # sudo mkdir -p /srv/docker/grafana/data; chown 472:472 /srv/docker/grafana/data
-      - "${DIR}/grafana:/var/lib/grafana"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.grafana.rule=Host(`grafana.${DOMAIN}`)"
-      - "traefik.http.routers.grafana.entrypoints=web"
-      - "traefik.http.services.grafana-service.loadbalancer.server.port=3000"
-
-  influx:
-    image: influxdb:1.7
-    container_name: influxdb
-    networks:
-      - backend
-    labels:
-      - "traefik.http.routers.influx.entryPoints=port8086"
-      - "traefik.http.routers.influx.rule=host(`influx.${DOMAIN}`)"
-      - "traefik.http.services.influx-service.loadBalancer.server.port=8086"
-    restart: always
-    volumes:
-      - ${DIR}/influx-data:/var/lib/influxdb
-    environment:
-      - INFLUXDB_DB=SOME_DB_NAME # set any other to create database on initialization
-      - INFLUXDB_HTTP_ENABLED=true
-      - INFLUXDB_HTTP_AUTH_ENABLED=true
-
-      - INFLUXDB_ADMIN_USER=SECURE_USERNAME
-      - INFLUXDB_ADMIN_PASSWORD=SECURE_PASS
-
   gitea:
     image: gitea/gitea:1.9.3
     container_name: gitea
@@ -151,58 +116,10 @@ services:
       - "traefik.http.services.mqtt-service.loadbalancer.server.port=9001"
       - "traefik.enable=true"
 
-  node-red:
-    image: nodered/node-red:latest
-    container_name: "node-red"
-    networks:
-      - backend
-    environment:
-      - TZ=Europe/Stockholm
-    ports:
-      - "1881:1880"
-    #devices:
-        #- /dev/ttyAMA0
-    restart: unless-stopped
-    user: ${UID}
-    volumes:
-      - ${DIR}/nodered:/data
-    labels:
-      - "traefik.http.routers.node-red.rule=Host(`nodered.${DOMAIN}`)"
-      - "traefik.http.routers.node-red.entrypoints=web"
-      - "traefik.http.services.node-red-service.loadbalancer.server.port=1880"
-      - "traefik.http.routers.node-red-secure.entrypoints=web-secure"
-      - "traefik.http.routers.node-red-secure.rule=Host(`nodered.${DOMAIN}`)"
-      - "traefik.http.routers.node-red-secure.tls.certresolver=milvert"
-      - "traefik.http.routers.node-red-secure.tls=true"
-      - "traefik.enable=true"
 
-  domoticz:
-    image: linuxserver/domoticz
-    container_name: domoticz
-    networks:
-      - backend
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Stockholm
-        #- WEBROOT=domoticz #optional
-    volumes:
-      - ${DIR}/domoticz:/config
-    ports:
-      - 8081:8080
-        #devices:
-        #- path to device:path to device
-    restart: unless-stopped
-    labels:
-      - "traefik.http.routers.domo.rule=Host(`domo.${DOMAIN}`)"
-      - "traefik.http.routers.domo.entrypoints=web"
-      - "traefik.http.services.domo-service.loadbalancer.server.port=8080"
-      - "traefik.enable=true"
-
-
-  reverse-proxy:
+  traefik:
     # The official v2.0 Traefik docker image
-    image: traefik:v2.1
+    image: traefik
     container_name: "traefik"
     networks:
       - backend
diff --git a/home_service/docker_compose.yml b/home_service/docker_compose.yml
new file mode 100644
index 0000000..3b52b56
--- /dev/null
+++ b/home_service/docker_compose.yml
@@ -0,0 +1,36 @@
+version: '3'
+
+services:
+
+  node-red:
+    image: nodered/node-red:latest
+    container_name: "node-red"
+    networks:
+      - backend
+    environment:
+      - TZ=Europe/Stockholm
+    ports:
+      - "1881:1880"
+    #devices:
+        #- /dev/ttyAMA0
+    restart: unless-stopped
+    user: ${UID}
+    volumes:
+      - ${DIR}/nodered:/data
+    labels:
+      - "traefik.http.routers.node-red.rule=Host(`nodered.${DOMAIN}`)"
+      - "traefik.http.routers.node-red.entrypoints=web"
+      - "traefik.http.services.node-red-service.loadbalancer.server.port=1880"
+      - "traefik.http.routers.node-red-secure.entrypoints=web-secure"
+      - "traefik.http.routers.node-red-secure.rule=Host(`nodered.${DOMAIN}`)"
+      - "traefik.http.routers.node-red-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.node-red-secure.tls=true"
+      - "traefik.enable=true"
+
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+