diff --git a/aap/Dockerfile b/aap/Dockerfile
index 2681e3d..adfc7d3 100644
--- a/aap/Dockerfile
+++ b/aap/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:latest
-LABEL maintainer "J. Elfring <devops@elfrinjo.de>"
+LABEL maintainer "J. Elfring <code@elfring.ms>"
 
 ## Install prereqs
 RUN apk add --update --no-cache \
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 9fd0b52..81cbcd6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,9 +7,9 @@ services:
     build: ./aap
     image: elfrinjo/aap:latest
 
-  feed-to-muc:
-    build: ./feed-to-muc
-    image: elfrinjo/feed-to-muc:latest
+ #feed-to-muc:
+ #  build: ./feed-to-muc
+ #  image: elfrinjo/feed-to-muc:latest
 
   prosody-0.11:
     build: ./prosody-0.11
@@ -22,3 +22,7 @@ services:
   webdav:
     build: ./webdav
     image: elfrinjo/webdav:latest
+
+  toolbox:
+    build: ./toolbox
+    image: elfrinjo/toolbox:latest
diff --git a/prosody-0.11/Dockerfile b/prosody-0.11/Dockerfile
index 48197b5..2462405 100644
--- a/prosody-0.11/Dockerfile
+++ b/prosody-0.11/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:edge
 
-LABEL maintainer "J. Elfring <devops@elfrinjo.de>"
+LABEL maintainer "J. Elfring <code@elfring.ms>
 
 ## Install Packages
 RUN apk add --no-cache \
diff --git a/torrelay/Dockerfile b/torrelay/Dockerfile
index 31e6e8f..46eed9f 100644
--- a/torrelay/Dockerfile
+++ b/torrelay/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:edge
-LABEL maintainer "J. Elfring <devops@elfrinjo.de>"
+LABEL maintainer "J. Elfring <code@elfring.ms>
 
 RUN apk --update --no-cache add tor
 
diff --git a/webdav/Dockerfile b/webdav/Dockerfile
index adb1f54..8d4780c 100644
--- a/webdav/Dockerfile
+++ b/webdav/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3.12
-LABEL maintainer "J. Elfring <devops@elfrinjo.de>"
+LABEL maintainer "J. Elfring <code@elfring.ms>
 
 ## Install prereqs
 RUN apk add --update --no-cache \