diff --git a/.travis.yml b/.travis.yml
index adf68979f3be70a12ea4474358f0c6696601a46a..f9d7f4970e5f2ebe981a0f1d7739f0031ccb9b3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ group: beta
 services: [docker]
 
 install:
-  - pip install -r tests/requirements.txt
+  - pip install -r tests/requirements.txt | cat
   - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
   - molecule dependency
 
@@ -17,3 +17,4 @@ script:
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  email: false
diff --git a/README.rst b/README.rst
index c2ee62133c1d4113869bd07f10f2e7d0b7823ac0..72f51c3db9760eb7c0696bbc4ce8b6430088c2e3 100644
--- a/README.rst
+++ b/README.rst
@@ -1,13 +1,15 @@
 Python 2.7
 ##########
 
+.. image:: https://travis-ci.org/adarnimrod/python27.svg?branch=master
+    :target: https://travis-ci.org/adarnimrod/python27
+
 Install Python 2.7, pip and packages to enable SSL SNI support (if needed).
 
 Requirements
 ------------
 
-See :code:`meta/main.yml`, :code:`tests/requirements.yml` and assertions at
-the top of :code:`tasks/main.yml`.
+See :code:`meta/main.yml` and assertions at the top of :code:`tasks/main.yml`.
 
 Role Variables
 --------------
diff --git a/defaults/main.yml b/defaults/main.yml
index ec3426242253f9728c153006a792032892bdecfc..393ef4ab73d9a05ab5ecbd4d794f03ad5dcfa667 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-# defaults file for ansible-role-python27
+# defaults file for python27
diff --git a/handlers/main.yml b/handlers/main.yml
index 6c671a62bd2aa6fb2663712f250fe5c5e2ed8551..3bbc9ae2520c7339e43a0c962ceff16fa85fc85c 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for ansible-role-python27
+# handlers file for python27
diff --git a/meta/main.yml b/meta/main.yml
index b816f20a4e3e25409dae8ecc3dcc21b4c730730e..ca822fd833764f417be8a0e832bc487ee6525ceb 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,6 +1,6 @@
 galaxy_info:
   author: Nimrod Adar
-  description: An example Ansible role
+  description: Install Python 2.7, pip and packages to enable SSL SNI support (if needed)
   company: Shore technologies
   license: MIT
   min_ansible_version: 2.0
@@ -20,5 +20,5 @@ galaxy_info:
     versions:
     - trusty
     - xenial
-  galaxy_tags: [ ansible ]
+  galaxy_tags: [ ansible, python ]
 dependencies: []
diff --git a/molecule.yml b/molecule.yml
index 0d9e6f2ee21b6fe7dd6b548e4165ea049dd5a6c0..a4560346efcb1a9263637dfd0e4f12d0e19865b0 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -25,7 +25,7 @@ vagrant:
   - name: jessie
     box: debian/jessie64
   instances:
-  - name: ansible-role-python27
+  - name: python27
     options:
         append_platform_to_hostname: yes
   raw_config_args:
@@ -36,18 +36,23 @@ vagrant:
 
 docker:
   containers:
-  - name: ansible-role-python27-xenial
+  - name: python27-xenial
     image: ubuntu
     image_version: xenial
     environment:
         DEBIAN_FRONTEND: noninteractive
-  - name: ansible-role-python27-trusty
+  - name: python27-trusty
     image: ubuntu
     image_version: trusty
     environment:
         DEBIAN_FRONTEND: noninteractive
-  - name: ansible-role-python27-jessie
+  - name: python27-jessie
     image: debian
     image_version: jessie
     environment:
         DEBIAN_FRONTEND: noninteractive
+  - name: python27-stretch
+    image: debian
+    image_version: stretch
+    environment:
+        DEBIAN_FRONTEND: noninteractive
diff --git a/tasks/main.yml b/tasks/main.yml
index 33764197c0e34339563ab565afdc32d7dffeb539..be0aee0df813cce0667b601c99fc3085dcac5cc5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,5 @@
 ---
-# tasks file for ansible-role-python27
-
+# tasks file for python27
 - name: Assertions
   assert:
     that:
diff --git a/tests/playbook.yml b/tests/playbook.yml
index fd0fa444884a11b88f1f10304cd1c519a3963a77..1282e736e0e37066e636c5fa2bbd325b60f5a74a 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,11 +1,11 @@
 ---
-- hosts: ansible-role-python27-openbsd*
+- hosts: python27-openbsd*
   gather_facts: False
-  roles: [openbsd_bootstrap]
+  roles: [adarnimrod.openbsd-bootstrap]
 
-- hosts: ansible-role-python27-xenial
+- hosts: python27-xenial
   gather_facts: False
-  roles: [debian_bootstrap]
+  roles: [adarnimrod.debian-bootstrap]
 
 - hosts: all
-  roles: [ansible-role-python27]
+  roles: [python27]
diff --git a/tests/requirements.yml b/tests/requirements.yml
index 2fd4277a79ac54c36daf1dc8d983d8bbdce2732f..cdc294cd67e8c5b70eed5178580e6edde25e10bb 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -1,7 +1,3 @@
 ---
-- src: https://github.com/adarnimrod/ansible-role-openbsd-bootstrap
-  scm: git
-  name: openbsd_bootstrap
-- src: https://github.com/adarnimrod/ansible-role-debian-bootstrap
-  scm: git
-  name: debian_bootstrap
+- src: adarnimrod.openbsd-bootstrap
+- src: adarnimrod.debian-bootstrap
diff --git a/vars/main.yml b/vars/main.yml
index 5bbce1b50bc3052adecf785cfdfb1bf43f1fad34..3993ff9a702f50712ba2c02b1e859b06f5967f64 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for ansible-role-python27
+# vars file for python27