diff --git a/.travis.yml b/.travis.yml
index 1c4a529..bb41dd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,31 +8,33 @@ services:
   - docker
 
 env:
+  global:
+    namespace="robertdebock"
   matrix:
-    - image="docker-alpine-openrc"
-    - image="docker-alpine-openrc" tag="edge"
-    # - namespace="archlinux/" image="base"
-    - image="docker-debian-systemd" tag="stable"
-    - image="docker-debian-systemd" tag="unstable"
-    - image="docker-debian-systemd"
-    - image="docker-fedora-systemd"
-    - image="docker-fedora-systemd" tag="rawhide"
-    - image="docker-centos-systemd" tag="7"
-    - image="docker-redhat-systemd" tag="7"
-    - image="docker-centos-systemd"
-    - image="docker-redhat-systemd"
-    - image="docker-opensuse-systemd"
-    - image="docker-ubuntu-systemd" tag="rolling"
-    - image="docker-ubuntu-systemd" tag="devel"
-    - image="docker-ubuntu-systemd"
+    - image="alpine"
+    - image="alpine" tag="edge"
+    # - namespace="archlinux" image="base"
+    - image="debian" tag="stable"
+    - image="debian" tag="unstable"
+    - image="debian"
+    - image="fedora"
+    - image="fedora" tag="rawhide"
+    - image="centos" tag="7"
+    - image="redhat" tag="7"
+    - image="centos"
+    - image="redhat"
+    - image="opensuse"
+    - image="ubuntu" tag="rolling"
+    - image="ubuntu" tag="devel"
+    - image="ubuntu"
 
 matrix:
   allow_failures:
-    - env: image="docker-alpine-openrc" tag="edge"
-    - env: image="docker-debian-systemd" tag="unstable"
-    - env: image="docker-fedora-systemd" tag="rawhide"
-    - env: image="docker-ubuntu-systemd" tag="rolling"
-    - env: image="docker-ubuntu-systemd" tag="devel"
+    - env: image="alpine" tag="edge"
+    - env: image="debian" tag="unstable"
+    - env: image="fedora" tag="rawhide"
+    - env: image="ubuntu" tag="rolling"
+    - env: image="ubuntu" tag="devel"
 
 cache:
   - pip
diff --git a/README.md b/README.md
index 7538c42..72e1b18 100644
--- a/README.md
+++ b/README.md
@@ -120,21 +120,21 @@ This role has been tested on these [container images](https://hub.docker.com/):
 
 |container|tag|allow_failures|
 |---------|---|--------------|
-|docker-alpine-openrc|latest|no|
-|docker-alpine-openrc|edge|yes|
-|docker-debian-systemd|stable|yes|
-|docker-debian-systemd|unstable|yes|
-|docker-debian-systemd|latest|no|
-|docker-fedora-systemd|latest|no|
-|docker-fedora-systemd|rawhide|yes|
-|docker-centos-systemd|7|no|
-|docker-redhat-systemd|7|no|
-|docker-centos-systemd|latest|no|
-|docker-redhat-systemd|latest|no|
-|docker-opensuse-systemd|latest|no|
-|docker-ubuntu-systemd|rolling|yes|
-|docker-ubuntu-systemd|devel|yes|
-|docker-ubuntu-systemd|latest|no|
+|alpine|latest|no|
+|alpine|edge|yes|
+|debian|stable|yes|
+|debian|unstable|yes|
+|debian|latest|no|
+|fedora|latest|no|
+|fedora|rawhide|yes|
+|centos|7|no|
+|redhat|7|no|
+|centos|latest|no|
+|redhat|latest|no|
+|opensuse|latest|no|
+|ubuntu|rolling|yes|
+|ubuntu|devel|yes|
+|ubuntu|latest|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: