diff --git a/.travis.yml b/.travis.yml
index 277a41f..022d077 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,11 @@ services:
   - docker
 
 env:
+  global:
+    namespace="robertdebock"
   matrix:
-    - image="docker-centos-systemd" tag="7"
-    - image="docker-redhat-systemd" tag="7"
+    - image="centos" tag="7"
+    - image="redhat" tag="7"
 
 matrix:
   allow_failures:
diff --git a/README.md b/README.md
index 56dab6a..0d52a65 100644
--- a/README.md
+++ b/README.md
@@ -83,8 +83,8 @@ This role has been tested on these [container images](https://hub.docker.com/):
 
 |container|tag|allow_failures|
 |---------|---|--------------|
-|docker-centos-systemd|7|no|
-|docker-redhat-systemd|7|no|
+|centos|7|no|
+|redhat|7|no|
 
 This role has been tested on these Ansible versions:
 
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index b2ec24a..1b7af1d 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,8 +8,8 @@ lint:
 driver:
   name: docker
 platforms:
-  - name: "${image:-default}-${TOX_ENVNAME:-default}"
-    image: "robertdebock/${image:-docker-fedora-systemd}:${tag:-latest}"
+  - name: "${namespace:-robertdebock-}${image:-fedora}-${TOX_ENVNAME:-default}"
+    image: "${namespace:-robertdebock}/${image:-fedora}:${tag:-latest}"
     command: sh -c "while true ; do sleep 30 ; done"
     pre_build_image: yes
 provisioner: