diff --git a/ansible/Dockerfile b/ansible/Dockerfile
index 83bea7f..1b1ff8a 100644
--- a/ansible/Dockerfile
+++ b/ansible/Dockerfile
@@ -8,7 +8,7 @@
 # 	ansible all -m ping
 #
 FROM alpine:latest
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 RUN builddeps=' \
 		python-dev \
diff --git a/evince/Dockerfile b/evince/Dockerfile
index 1a3d4bd..489a9c9 100644
--- a/evince/Dockerfile
+++ b/evince/Dockerfile
@@ -1,5 +1,5 @@
 # DESCRIPTION:	Create evince container with its dependencies (https://wiki.gnome.org/Apps/Evince)
-# AUTHOR:		Christian Koep <christian.koep@fom-net.de>
+# AUTHOR:		Christian Koep <christiankoep@gmail.com>
 # USAGE:
 #	# Build evince image
 #	docker build -t evince .
@@ -13,7 +13,7 @@
 #
 
 FROM debian:stretch
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 RUN apt-get -qq update && apt-get install -y \
 	evince \
diff --git a/guetzli/Dockerfile b/guetzli/Dockerfile
index 40cecf4..355a5eb 100644
--- a/guetzli/Dockerfile
+++ b/guetzli/Dockerfile
@@ -6,7 +6,7 @@
 # 	--verbose /tmp/example.jpg /tmp/example.compressed.jpg
 
 FROM alpine:latest
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 RUN apk --no-cache add \
 		libpng \
diff --git a/keepass2/Dockerfile b/keepass2/Dockerfile
index a8dad99..b1a1f02 100644
--- a/keepass2/Dockerfile
+++ b/keepass2/Dockerfile
@@ -1,5 +1,5 @@
 # DESCRIPTION:	Create keepass2 container with its dependencies
-# AUTHOR:		Christian Koep <christian.koep@fom-net.de>
+# AUTHOR:		Christian Koep <christiankoep@gmail.com>
 # USAGE:
 #	# Build keepass2 image
 #	docker build -t keepass2 .
@@ -18,7 +18,7 @@
 #
 
 FROM debian:sid
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/keepassxc/Dockerfile b/keepassxc/Dockerfile
index 5624b90..e32322e 100644
--- a/keepassxc/Dockerfile
+++ b/keepassxc/Dockerfile
@@ -8,7 +8,7 @@
 #		keepassxc
 #
 FROM alpine:latest
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 ENV KEEPASSXC_VERSION 2.1.1
 
diff --git a/metasploit/Dockerfile b/metasploit/Dockerfile
index ff00a87..0b7bfe8 100644
--- a/metasploit/Dockerfile
+++ b/metasploit/Dockerfile
@@ -1,5 +1,5 @@
 FROM r.j3ss.co/kalilinux
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     metasploit-framework \
diff --git a/micro/Dockerfile b/micro/Dockerfile
index 66f4dd2..162da8d 100644
--- a/micro/Dockerfile
+++ b/micro/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:latest
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
diff --git a/powershell/Dockerfile b/powershell/Dockerfile
index 1fe90d2..ade8726 100644
--- a/powershell/Dockerfile
+++ b/powershell/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:16.04
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 ENV POWERSHELL_VERSION 6.0.0-alpha.17
 
diff --git a/routersploit/Dockerfile b/routersploit/Dockerfile
index 870caee..2cd86e0 100644
--- a/routersploit/Dockerfile
+++ b/routersploit/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:sid
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 ENV ROUTERSPLOIT_VERSION v2.2.1
 
diff --git a/sublime-text-3/Dockerfile b/sublime-text-3/Dockerfile
index d8e26c7..4e05a4c 100644
--- a/sublime-text-3/Dockerfile
+++ b/sublime-text-3/Dockerfile
@@ -1,5 +1,5 @@
 # DESCRIPTION:	Create sublime-text 3 container with its dependencies (https://www.sublimetext.com/3)
-# AUTHORS:		Christian Koep <christian.koep@fom-net.de>, Chuck Knox <charles.m.knox@gmail.com>
+# AUTHORS:		Christian Koep <christiankoep@gmail.com>, Chuck Knox <charles.m.knox@gmail.com>
 # USAGE:
 #	# Build sublime-text 3 image
 #	docker build -t sublime-text:3 .
@@ -24,7 +24,7 @@
 #
 
 FROM debian:stretch
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 # Installing the libcanberra-gtk-module gets rid of a lot of annoying error messages.
 RUN apt-get update && apt-get -y install \
diff --git a/texlive/Dockerfile b/texlive/Dockerfile
index 116dd20..80745fb 100644
--- a/texlive/Dockerfile
+++ b/texlive/Dockerfile
@@ -7,7 +7,7 @@
 # https://github.com/andygrunwald/FOM-LaTeX-Template
 
 FROM debian:stretch
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 RUN apt-get update && apt-get install -y \
     texlive-full \
diff --git a/tor-browser/hardened/Dockerfile b/tor-browser/hardened/Dockerfile
index 15b297c..9b04b1a 100644
--- a/tor-browser/hardened/Dockerfile
+++ b/tor-browser/hardened/Dockerfile
@@ -6,7 +6,7 @@
 #	tor-browser
 #
 FROM debian:stretch
-LABEL maintainer "Christian Koep <christian.koep@fom-net.de>"
+LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 RUN apt-get update && apt-get install -y \
 	ca-certificates \