diff --git a/scripts/setup.sh b/scripts/setup.sh
index f63bd60833449a15860fc0a11b22543628953a4c..175d22cdb40b2fbe4df00b0c995059ee0dd1526e 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -10,10 +10,10 @@ cp /data/infrastructure/unit-files/* /etc/systemd/system
 systemctl daemon-reload
 
 # Pull relevant docker images
-docker pull pierreozoux/haproxy-confd
-docker pull tutum/mysql
-docker pull tutum/wordpress-stackable
-docker pull tutum/nginx
+docker pull indiehosters/haproxy-confd
+docker pull indiehosters/mysql
+docker pull indiehosters/wordpress
+docker pull indiehosters/nginx
 
 # Configure and start HAproxy
 mkdir -p /data/server-wide/haproxy/approved-certs
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index d32f36944a543e4c1937b9a0a8638831197ed9a2..8331b4be6dcf323b653f595802682d16a257b455 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -13,7 +13,7 @@ ExecStart=/usr/bin/docker run\
 -p 80:80\
 -p 443:443\
 -v /data/server-wide/haproxy/approved-certs/:/etc/haproxy/approved-certs\
-pierreozoux/haproxy-confd
+indiehosters/haproxy-confd
 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 cdbaeb5567be672dc6bbca378a1673451f599512..d96dd96e08861394e3c602df06865a0af79f9a31 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -14,7 +14,7 @@ ExecStart=/usr/bin/docker run\
 --name %p-%i\
 -v /data/per-user/%i/%p/data:/var/lib/mysql\
 --env-file /data/per-user/%i/%p/.env\
-tutum/mysql
+indiehosters/mysql
 ExecReload=/usr/bin/docker restart %p-%i
 ExecStop=/usr/bin/docker stop %p-%i 
 
diff --git a/unit-files/nginx@.service b/unit-files/nginx@.service
index c91765d016d40c02d9511678a69b4a457546c20c..b04ad697a247ce838c11f00f075bf635ef369697 100644
--- a/unit-files/nginx@.service
+++ b/unit-files/nginx@.service
@@ -17,7 +17,7 @@ ExecStart=/usr/bin/docker run\
 --name %p-%i\
 -v /data/per-user/%i/%p/data/www-content:/app\
 --env-file /data/per-user/%i/%p/.env\
-tutum/nginx
+indiehosters/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 19d108327f8c9feb17427b8416cf4d73af750417..96a540222c9442864553a95837133aad6688de40 100644
--- a/unit-files/wordpress@.service
+++ b/unit-files/wordpress@.service
@@ -23,7 +23,7 @@ ExecStart=/usr/bin/docker run\
 -v /data/per-user/%i/%p/data/wp-content:/app/wp-content\
 -v /data/per-user/%i/%p/data/.htaccess:/app/.htaccess\
 --env-file /data/per-user/%i/%p/.env\
-tutum/wordpress-stackable
+indiehosters/wordpress
 ExecReload=/usr/bin/docker restart %p-%i
 ExecStop=/usr/bin/docker stop %p-%i