diff --git a/defaults/main.yml b/defaults/main.yml
index a6ad383406df2f306e26b30b49882f695ba3e983..f89af6c0c570d95b5aea7bba8c62d0e2b32850df 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-# defaults file for ansible-role-ca-store
+# defaults file for ca-store
diff --git a/handlers/main.yml b/handlers/main.yml
index b64d5194feee9fa5fb4ceb2c8f82e70ee7209ffd..a03a885b96b74591066416cf5319d01b0fc69109 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,4 @@
 ---
-# handlers file for ansible-role-ca-store
-
+# handlers file for ca-store
 - name: Update CA store
   command: '{{ "/usr/local/sbin/update-ca-certificates" if ansible_os_family == "OpenBSD" else "/usr/sbin/update-ca-certificates" }}'
diff --git a/meta/main.yml b/meta/main.yml
index 0fe517bd8843fc8adc805110c9fe4e8ec7df8b03..24430493a84818e0967b398fb6dd13fa86659a8e 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,6 +1,6 @@
 galaxy_info:
   author: Nimrod Adar
-  description: Install and configure similar CA store mechanism
+  description: Install and configure common CA store mechanism
   company: Shore technologies
   license: MIT
   min_ansible_version: 2.0
@@ -12,5 +12,9 @@ galaxy_info:
   - name: Debian
     versions:
     - jessie
+  - name: Ubuntu
+    versions:
+    - trusty
+    - xenial
   galaxy_tags: []
 dependencies: []
diff --git a/molecule.yml b/molecule.yml
index 99721de9735452439e14598f4cedecd38965e8b0..9de1bd0bb3f1b4b88bbfe8c14a07634d462ac2ba 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -19,7 +19,7 @@ vagrant:
   - name: debian
     box: debian/jessie64
   instances:
-  - name: ansible-role-ca-store
+  - name: ca-store
     options:
         append_platform_to_hostname: yes
   raw_config_args:
@@ -30,17 +30,17 @@ vagrant:
 
 docker:
   containers:
-  - name: ansible-role-ca-store-xenial
+  - name: ca-store-xenial
     image: ubuntu
     image_version: xenial
     environment:
         DEBIAN_FRONTEND: noninteractive
-  - name: ansible-role-ca-store-trusty
+  - name: ca-store-trusty
     image: ubuntu
     image_version: trusty
     environment:
         DEBIAN_FRONTEND: noninteractive
-  - name: ansible-role-ca-store-jessie
+  - name: ca-store-jessie
     image: debian
     image_version: jessie
     environment:
diff --git a/tasks/main.yml b/tasks/main.yml
index 6ae53db88c89c7570e61becded028929ea91cbbf..ca3a4765ef6ee2f6c9e4f628a70e256ac2e9c335 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for ansible-role-example
+# tasks file for ca-store
 - name: Assertions
   assert:
     that:
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 7a44200ec589513f882422b652f239b4e07f7a93..82431f355423edc099cfcca987b49dd75dfbc11c 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: ansible-role-ca-store-openbsd
+- hosts: ca-store-openbsd
   gather_facts: false
   roles: [ openbsd_bootstrap ]
 
diff --git a/tests/requirements.yml b/tests/requirements.yml
index 2fd4277a79ac54c36daf1dc8d983d8bbdce2732f..1eeb2ae811b1d8d19e3f50a454fb4b5603008512 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
+- role: openbsd-bootstrap
+- role: debian-bootstrap
diff --git a/vars/main.yml b/vars/main.yml
index 28b7c0bac726bd6c52ef4ddb74497d56af8617f5..7e5228a59ed148d700361bc6af245e121ca109f6 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for ansible-role-ca-store
+# vars file for ca-store