diff --git a/dockerfiles/email/forwarder/Dockerfile b/dockerfiles/email-forwarder/Dockerfile
similarity index 100%
rename from dockerfiles/email/forwarder/Dockerfile
rename to dockerfiles/email-forwarder/Dockerfile
diff --git a/dockerfiles/email/forwarder/assets/install.sh b/dockerfiles/email-forwarder/assets/install.sh
similarity index 100%
rename from dockerfiles/email/forwarder/assets/install.sh
rename to dockerfiles/email-forwarder/assets/install.sh
diff --git a/dockerfiles/services/known/Dockerfile b/dockerfiles/services/known/Dockerfile
index 81e4255f1fb5d2b6efa107461500e36bed1dfe43..71ba55b7107255c7dab9f784aad79d7de6164006 100644
--- a/dockerfiles/services/known/Dockerfile
+++ b/dockerfiles/services/known/Dockerfile
@@ -1,4 +1,4 @@
-FROM indiehosters/apache
+FROM pierreozoux/apache
# Download latest version of Known into /app
RUN mkdir -p ; cd /app ; curl -L http://assets.withknown.com/releases/known-0.6.5.tgz | tar xz
diff --git a/dockerfiles/services/wordpress/Dockerfile b/dockerfiles/services/wordpress/Dockerfile
index 6aeaffc10e059c882182f8008844a5d0fc45a7a0..5c4a46252e97218895af51816a66d0cd43fc91e5 100644
--- a/dockerfiles/services/wordpress/Dockerfile
+++ b/dockerfiles/services/wordpress/Dockerfile
@@ -1,4 +1,4 @@
-FROM indiehosters/apache
+FROM pierreozoux/apache
# Download latest version of Wordpress into /app
RUN curl -L https://wordpress.org/wordpress-4.0.tar.gz | tar xz && \
diff --git a/scripts/setup.sh b/scripts/setup.sh
index aff3c1a580d90bbe6fae8b8f3621c61f2a1cfcbe..347c6e390ed888d1505835d1d7a8e363bd136d08 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -13,13 +13,13 @@ if [ -f /tmp/vagrantfile-user-data ]; then
fi
# Pull relevant docker images
-docker pull indiehosters/haproxy
-docker pull indiehosters/confd
-docker pull indiehosters/postfix-forwarder
-docker pull indiehosters/nginx
-docker pull indiehosters/mysql
-docker pull indiehosters/wordpress
-docker pull indiehosters/known
+docker pull pierreozoux/haproxy
+docker pull pierreozoux/confd
+docker pull pierreozoux/email-forwarder
+docker pull pierreozoux/nginx
+docker pull pierreozoux/mysql
+docker pull pierreozoux/wordpress
+docker pull pierreozoux/known
# Install unit-files
sudo cp /data/indiehosters/unit-files/* /etc/systemd/system && systemctl daemon-reload
@@ -32,8 +32,8 @@ mkdir -p /data/runtime/postfix
# Configure and start HAproxy
cp /data/indiehosters/scripts/unsecure-certs/indiehosters.dev.pem /data/runtime/haproxy/approved-certs/default.pem
-systemctl enable haproxy-confd.service
-systemctl start haproxy-confd.service
+systemctl enable confd.service
+systemctl start confd.service
systemctl enable haproxy.path
systemctl start haproxy.path
@@ -42,8 +42,8 @@ touch /data/runtime/postfix/hostname
touch /data/runtime/postfix/destinations
touch /data/runtime/postfix/forwards
-systemctl enable postfix.service
-systemctl start postfix.service
+systemctl enable email-forwarder.service
+systemctl start email-forwarder.service
# Adds backup ssh key to the list of known hosts
ssh -o StrictHostKeyChecking=no `cat /data/BACKUP_DESTINATION` "exit"
diff --git a/unit-files/backup@.service b/unit-files/backup@.service
index 85145bcb0a8d0a35586b920999a8f57086690d22..4bf8e865727f1c67ffd9eeecf4ff757f421aecd4 100644
--- a/unit-files/backup@.service
+++ b/unit-files/backup@.service
@@ -14,7 +14,7 @@ ExecStartPre=/bin/bash -euxc ' \
--name mysqldump-%i \
--link mysql-%i:db \
--env-file /data/domains/%i/mysql/.env \
- indiehosters/mysql \
+ pierreozoux/mysql \
mysqldump \
--all-databases \
--events \
diff --git a/unit-files/haproxy-confd.service b/unit-files/confd.service
similarity index 96%
rename from unit-files/haproxy-confd.service
rename to unit-files/confd.service
index a96a50191f5d306336fddd5717c9cada91d908ab..d02f300ddc7fad70ed04dbc2e70ab83adcf03531 100644
--- a/unit-files/haproxy-confd.service
+++ b/unit-files/confd.service
@@ -18,7 +18,7 @@ ExecStart=/usr/bin/docker run \
--name %p \
-v /data/runtime/haproxy/:/etc/haproxy/ \
-v /var/run/docker.sock:/var/run/docker.sock \
- indiehosters/confd
+ pierreozoux/confd
ExecReload=/usr/bin/docker restart %p
ExecStop=/usr/bin/docker stop %p
diff --git a/unit-files/postfix.service b/unit-files/email-forwarder.service
similarity index 92%
rename from unit-files/postfix.service
rename to unit-files/email-forwarder.service
index c30de9065aac0474cc11169813d31f80946b869c..b0bf3d3d08d8a83bc9cdf788ce87a434dbd0e06c 100644
--- a/unit-files/postfix.service
+++ b/unit-files/email-forwarder.service
@@ -15,7 +15,7 @@ ExecStart=/usr/bin/docker run \
--name %p \
-v /data/runtime/postfix/:/data \
-p 25:25 \
- indiehosters/postfix-forwarder
+ pierreozoux/email-forwarder
ExecReload=/usr/bin/docker restart %p
ExecStop=/usr/bin/docker stop %p
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index 2c13025ebb6235dc3bf036b58e90da7790e54133..1ddf77be694036157f161c1768ac986b4af0383d 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -16,7 +16,7 @@ ExecStart=/usr/bin/docker run \
-v /data/runtime/haproxy:/etc/haproxy \
-p 80:80 \
-p 443:443 \
- indiehosters/haproxy
+ pierreozoux/haproxy
ExecReload=/usr/bin/docker restart %p
ExecStop=/usr/bin/docker stop %p
diff --git a/unit-files/known@.service b/unit-files/known@.service
index 9280b0e8c4106d0eb7aa6dd7ec45cb390383a083..fe592dc3abd9803a1262da637d68357da8f44a1c 100644
--- a/unit-files/known@.service
+++ b/unit-files/known@.service
@@ -28,7 +28,7 @@ ExecStart=/usr/bin/docker run \
-v /data/domains/%i/%p/known-content:/app/known-content \
-v /data/domains/%i/%p/.htaccess:/app/.htaccess \
--env-file /data/domains/%i/%p/.env \
- indiehosters/known
+ pierreozoux/known
ExecReload=/usr/bin/docker restart %p-%i
ExecStop=/usr/bin/docker stop %p-%i
diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index 809d0ff2bfaaed037cacc273a7cf260739a67079..af62299a158a92a70bc7a02a1293c1decc7975d3 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -19,7 +19,7 @@ ExecStart=/usr/bin/docker run \
-v /data/runtime/domains/%i/%p/db_files:/var/lib/mysql \
-e STARTUP_SQL="/data/domains/%i/%p/dump.sql" \
--env-file /data/domains/%i/%p/.env \
- indiehosters/mysql
+ pierreozoux/mysql
ExecReload=/usr/bin/docker restart %p-%i
ExecStop=/usr/bin/docker stop %p-%i
diff --git a/unit-files/static-git@.service b/unit-files/static-git@.service
index b845cae47eebc1638bd189f371bd17c601f514bf..33c7246a67a8bb09ebe0a4293ae216c086397ffe 100644
--- a/unit-files/static-git@.service
+++ b/unit-files/static-git@.service
@@ -20,7 +20,7 @@ ExecStartPre=-/usr/bin/docker rm %p-%i
ExecStart=/usr/bin/docker run \
--name %p-%i \
-v /data/runtime/domains/%i/%p/www-content:/app \
- indiehosters/nginx
+ pierreozoux/nginx
ExecReload=/usr/bin/docker restart %p-%i
ExecStop=/usr/bin/docker stop %p-%i
diff --git a/unit-files/static@.service b/unit-files/static@.service
index c8fd4361fe5911d5e3f9b4745482172edbf269ec..edec3d9c87cdb4ba68823589999b83cc9573785e 100644
--- a/unit-files/static@.service
+++ b/unit-files/static@.service
@@ -19,7 +19,7 @@ ExecStartPre=-/usr/bin/docker rm %p-%i
ExecStart=/usr/bin/docker run \
--name %p-%i \
-v /data/domains/%i/%p/www-content:/app \
- indiehosters/nginx
+ pierreozoux/nginx
ExecReload=/usr/bin/docker restart %p-%i
ExecStop=/usr/bin/docker stop %p-%i
diff --git a/unit-files/wordpress@.service b/unit-files/wordpress@.service
index 518f4901f086241affce5e9b7cc36b17c1467b31..3f78ac6cd024e2fc0fa0c62e985b5eaafba56396 100644
--- a/unit-files/wordpress@.service
+++ b/unit-files/wordpress@.service
@@ -28,7 +28,7 @@ ExecStart=/usr/bin/docker run \
-v /data/domains/%i/%p/wp-content:/app/wp-content \
-v /data/domains/%i/%p/.htaccess:/app/.htaccess \
--env-file /data/domains/%i/%p/.env \
- indiehosters/wordpress
+ pierreozoux/wordpress
ExecReload=/usr/bin/docker restart %p-%i
ExecStop=/usr/bin/docker stop %p-%i