diff --git a/dockerfiles/email/dovecot/Dockerfile b/dockerfiles/email/dovecot/Dockerfile
index 73433ab094cbcb9d2c1e9c60dec9d5cf1a472d68..112cf1075cf9cf28c9ae42daf67dc9b445681bc8 100644
--- a/dockerfiles/email/dovecot/Dockerfile
+++ b/dockerfiles/email/dovecot/Dockerfile
@@ -1,4 +1,4 @@
-FROM pierreozoux/base-email
+FROM indiepaas/base-email
RUN apt-get update && \
apt-get install -q -y \
diff --git a/dockerfiles/email/postfix/Dockerfile b/dockerfiles/email/postfix/Dockerfile
index f6c317ba2bc0c7f0bac9c53c45598ad78e8f376f..3f211dc5ba91836468ce56f6d98d5764ae606853 100644
--- a/dockerfiles/email/postfix/Dockerfile
+++ b/dockerfiles/email/postfix/Dockerfile
@@ -1,4 +1,4 @@
-FROM pierreozoux/base-email
+FROM indiepaas/base-email
RUN apt-get update && \
apt-get install -q -y \
diff --git a/dockerfiles/services/known/Dockerfile b/dockerfiles/services/known/Dockerfile
index e0eccb32a108682c7c543ec17d475fee515e63ac..7c243465b23ebc965de9c8ad050c5733dd02d39d 100644
--- a/dockerfiles/services/known/Dockerfile
+++ b/dockerfiles/services/known/Dockerfile
@@ -1,4 +1,4 @@
-FROM pierreozoux/apache
+FROM indiepaas/apache
# Download latest version of Known into /app
RUN mkdir -p /app && \
diff --git a/dockerfiles/services/owncloud/Dockerfile b/dockerfiles/services/owncloud/Dockerfile
index 6b1a5ec26211c62f4e94037785d3fc86fb1e9d1e..b8c7cf938dea228fba4ea70824644f796d80cb8a 100644
--- a/dockerfiles/services/owncloud/Dockerfile
+++ b/dockerfiles/services/owncloud/Dockerfile
@@ -1,4 +1,4 @@
-FROM pierreozoux/nginx-php
+FROM indiepaas/nginx-php
# install owncloud
RUN echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/community/Debian_7.0/ /' >> /etc/apt/sources.list.d/owncloud.list && \
diff --git a/dockerfiles/services/piwik/Dockerfile b/dockerfiles/services/piwik/Dockerfile
index c967a46c001db0ea49839f1b12a68667891b5464..02b88307409a30a0bf3b8fd669f377d3c4ab6d9b 100644
--- a/dockerfiles/services/piwik/Dockerfile
+++ b/dockerfiles/services/piwik/Dockerfile
@@ -1,4 +1,4 @@
-FROM pierreozoux/nginx-php
+FROM indiepaas/nginx-php
RUN apt-get update && apt-get install -y \
php5-gd \
diff --git a/dockerfiles/services/wordpress/Dockerfile b/dockerfiles/services/wordpress/Dockerfile
index 15d60adbcbd0868690887840a0d48fbbca6972f9..a8acd0a03a5ba1bb2d96b996f202667f5431b1ae 100644
--- a/dockerfiles/services/wordpress/Dockerfile
+++ b/dockerfiles/services/wordpress/Dockerfile
@@ -1,4 +1,4 @@
-FROM pierreozoux/apache
+FROM indiepaas/apache
# Download latest version of Wordpress into /app
RUN curl -L https://wordpress.org/latest.tar.gz | tar xz && \
diff --git a/unit-files/backup@.service b/unit-files/backup@.service
index 7c631ad2e707e070e2d3b28d425e5a9d202b8caf..741b6a4f76a25fb124acd5105bdf2ac948d81412 100644
--- a/unit-files/backup@.service
+++ b/unit-files/backup@.service
@@ -17,7 +17,7 @@ ExecStartPre=/bin/bash -euxc ' \
--name mysqldump-%i \
--link mysql-%i:db \
--env-file /data/domains/%i/mysql/.env \
- pierreozoux/mysql \
+ indiepaas/mysql \
mysqldump \
--all-databases \
--events \
@@ -32,7 +32,7 @@ ExecStart=/bin/bash -euxc ' \
--name backup-%i \
-h backup.container \
-v /root:/root \
- -v /data/domains/%i:/backup pierreozoux/duplicity \
+ -v /data/domains/%i:/backup indiepaas/duplicity \
--full-if-older-than 1W \
--encrypt-key ${ENCRYPT_KEY} \
/backup \
diff --git a/unit-files/confd.service b/unit-files/confd.service
index 3b09cc4f6c233ce08d9f1a5f160b013c1ab70b4b..3d2f997322a0115d005513578f50de40c42b7005 100644
--- a/unit-files/confd.service
+++ b/unit-files/confd.service
@@ -21,7 +21,7 @@ ExecStart=/usr/bin/docker run \
--name %p \
-v /data/runtime/haproxy/:/etc/haproxy/ \
-v /var/run/docker.sock:/var/run/docker.sock \
- pierreozoux/confd
+ indiepaas/confd
ExecReload=/usr/bin/docker restart %p
ExecStop=/usr/bin/docker stop %p
diff --git a/unit-files/dovecot.service b/unit-files/dovecot.service
index 41d05e061b95380a7068af1c3087d222b7fed877..5c78788d2785910fc8439265e10dbbb3ccfda7c6 100644
--- a/unit-files/dovecot.service
+++ b/unit-files/dovecot.service
@@ -30,7 +30,7 @@ ExecStart=/bin/bash -euxc ' \
--env-file=/data/domains/mail/.env \
--link mysql-mail:db \
-p 993:993 \
- pierreozoux/dovecot'
+ indiepaas/dovecot'
ExecReload=/usr/bin/docker restart dovecot
ExecStop=/usr/bin/docker stop dovecot
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index 0a55ca92664ff8603689aff82fafc931dd9ea601..bb156a445ad5d4b4f6b2ed4d7d48d9ce61471ed2 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -21,7 +21,7 @@ ExecStart=/usr/bin/docker run \
-v /data/runtime/haproxy:/etc/haproxy \
-p 80:80 \
-p 443:443 \
- pierreozoux/haproxy
+ indiepaas/haproxy
ExecReload=/usr/bin/docker restart %p
ExecStop=/usr/bin/docker stop %p
diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index ce276a060d6b08e6725f19f49709dfbfe55fad8a..54c403f7cdadf86f47ef4ed158e658e45f2bb8a6 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -37,7 +37,7 @@ ExecStart=/opt/bin/systemd-docker run \
-v /data/runtime/domains/%i/log/mysql:/var/log/mysql \
-v /data/runtime/domains/%i/%p/db_files:/var/lib/mysql \
--env-file /data/domains/%i/%p/.env \
- pierreozoux/mysql
+ indiepaas/mysql
ExecReload=/usr/bin/docker restart %p-%i
ExecStop=/usr/bin/docker stop %p-%i
diff --git a/unit-files/postfix.service b/unit-files/postfix.service
index 532dd059f56c1bb67ff12aa03144e86836701344..99f821c51b88f60dacfac47e537ec565d5f8fa39 100644
--- a/unit-files/postfix.service
+++ b/unit-files/postfix.service
@@ -28,7 +28,7 @@ ExecStart=/usr/bin/docker run \
-p 25:25 \
-p 587:587 \
-link=mysql-mail:db \
- pierreozoux/postfix
+ indiepaas/postfix
ExecReload=/usr/bin/docker restart %p
ExecStop=/usr/bin/docker stop %p
diff --git a/unit-files/rsyslog.service b/unit-files/rsyslog.service
index 7c5d058cf82ea82ebd66445e986d6a82e5cb62ef..bc59fcef77b6d9a3303ddad592c7688a15d9f4d1 100644
--- a/unit-files/rsyslog.service
+++ b/unit-files/rsyslog.service
@@ -18,7 +18,7 @@ ExecStart=/usr/bin/docker run \
--name rsyslog \
-v /data/runtime/dev:/dev \
-v /data/runtime/log:/var/log \
- pierreozoux/rsyslog
+ indiepaas/rsyslog
ExecReload=/usr/bin/docker restart %p
ExecStop=/usr/bin/docker stop %p
diff --git a/unit-files/web@.service b/unit-files/web@.service
index 2c2daa7a2233ba751e3d2814aaf4fe4ee83d8bdd..ecb2ff476f813f980052124157e4bd6a3d351e65 100644
--- a/unit-files/web@.service
+++ b/unit-files/web@.service
@@ -30,7 +30,7 @@ ExecStart=/bin/bash -euxc ' \
--name %i \
-v /data/runtime/domains/%i/log/apache2:/var/log/apache2 \
${DOCKER_ARGUMENTS} \
- pierreozoux/${APPLICATION}'
+ indiepaas/${APPLICATION}'
ExecReload=/usr/bin/docker restart %i
ExecStop=/usr/bin/docker stop %i