diff --git a/bootstrap/playbooks/solar.yaml b/bootstrap/playbooks/solar.yaml
index 8a33cb93..341fc683 100644
--- a/bootstrap/playbooks/solar.yaml
+++ b/bootstrap/playbooks/solar.yaml
@@ -16,7 +16,7 @@
   tasks:
     #  setup solar-resources
     # change to openstack/solar-resources later
-    - git: repo=https://github.com/Mirantis/solar-resources.git version=0.2.0 dest=/vagrant/solar-resources update=no
+    - git: repo=https://github.com/openstack/solar-resources.git version=0.2.0 dest=/vagrant/solar-resources update=no
 
     - shell: 'mount|grep " /vagrant"'
       register: vagrant_mounted
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index 6d303ab1..0cb7b054 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -65,4 +65,4 @@ Where can I find solar examples ?
 ---------------------------------
 
 Example resources, composer templates and examples itself are located:
-https://github.com/Mirantis/solar-resources
+https://github.com/openstack/solar-resources
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 264eb25d..e94cf194 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -38,7 +38,7 @@ add them to a Solar repository.
 
 .. code-block:: bash
 
-  git clone https://github.com/Mirantis/solar-resources
+  git clone https://github.com/openstack/solar-resources
 
   sudo mkdir -p /var/lib/solar/repositories
   sudo chown -R <your_user_name> /var/lib/solar/
diff --git a/doc/source/resource.rst b/doc/source/resource.rst
index ada0208e..b49f97f0 100644
--- a/doc/source/resource.rst
+++ b/doc/source/resource.rst
@@ -15,7 +15,7 @@ typical resource.
 
 .. TODO: change to openstack/solar-resources later
 .. note::
-   You can find example resources https://github.com/Mirantis/solar-resources
+   You can find example resources https://github.com/openstack/solar-resources
 
 You can easily use this resource in your system,
 from CLI you just need to call ``solar resource create`` with correct options.
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index c2070ec1..7285e43a 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -20,15 +20,15 @@ Each API is used in different examples:
 Python API
 ~~~~~~~~~~
 
-* `3 node cluster riak <https://github.com/Mirantis/solar-resources/blob/master/examples/riak/riaks.py>`_
-* `hosts files <https://github.com/Mirantis/solar-resources/blob/master/examples/hosts_file/hosts.py>`_
-* `2 node OpenStack Cluster <https://github.com/Mirantis/solar-resources/blob/master/examples/openstack/openstack.py>`_
+* `3 node cluster riak <https://github.com/openstack/solar-resources/blob/master/examples/riak/riaks.py>`_
+* `hosts files <https://github.com/openstack/solar-resources/blob/master/examples/hosts_file/hosts.py>`_
+* `2 node OpenStack Cluster <https://github.com/openstack/solar-resources/blob/master/examples/openstack/openstack.py>`_
 
 Composer files
 ~~~~~~~~~~~~~~
 
-* `Wordpress site <https://github.com/Mirantis/solar-resources/tree/master/examples/wordpress>`_
-* `3 node cluster riak <https://github.com/Mirantis/solar-resources/blob/master/examples/riak/riak_cluster.yaml>`_
+* `Wordpress site <https://github.com/openstack/solar-resources/tree/master/examples/wordpress>`_
+* `3 node cluster riak <https://github.com/openstack/solar-resources/blob/master/examples/riak/riak_cluster.yaml>`_
 
 
 CLI API