diff --git a/.rubocop.yml b/.rubocop.yml
index 998c5846..17142ddf 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,7 +16,7 @@ AllCops:
 
 Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'ros-apartment.gemspec'
+    - "puzzle-apartment.gemspec"
 
 Metrics/BlockLength:
   Exclude:
diff --git a/.story_branch.yml b/.story_branch.yml
index 4143ff44..65e29e44 100644
--- a/.story_branch.yml
+++ b/.story_branch.yml
@@ -2,4 +2,4 @@
 tracker: github
 issue_placement: beginning
 project_id:
-- rails-on-services/apartment
+  - puzzle/apartment
diff --git a/README.md b/README.md
index 58ecd407..0d4614fc 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # Apartment
 
-[![Gem Version](https://badge.fury.io/rb/ros-apartment.svg)](https://badge.fury.io/rb/apartment)
-[![Code Climate](https://api.codeclimate.com/v1/badges/b0dc327380bb8438f991/maintainability)](https://codeclimate.com/github/rails-on-services/apartment/maintainability)
-[![Build Status](https://travis-ci.org/rails-on-services/apartment.svg?branch=development)](https://travis-ci.org/rails-on-services/apartment)
+[![Gem Version](https://badge.fury.io/rb/puzzle-apartment.svg)](https://badge.fury.io/rb/apartment)
 
 *Multitenancy for Rails and ActiveRecord*
 
@@ -12,19 +10,18 @@ but still allow some data to exist in a common tenant, Apartment can help.
 
 ## Apartment drop in replacement gem
 
-After having reached out via github issues and email directly, no replies ever
-came. Since we wanted to upgrade our application to Rails 6 we decided to fork
-and start some development to support Rails 6. Because we don't have access
+Nor the orginal [apartment](https://github.com/influitive/apartment) gem nor
+the Rails 6 for by [ros-apartment](https://github.com/rails-on-services/apartment)
+are maintained anymore.
+
+Since we wanted to upgrade our application to Rails 7.1 we decided to fork
+and start some development to support Rails 7.1. Because we don't have access
 to the apartment gem itself, the solution was to release it under a different
 name but providing the exact same API as it was before.
 
-## Help wanted
+We maintain this gem for our own projects at the moment but would love to see
+a living community fork showing up again.
 
-We were never involved with the development of Apartment gem in the first place
-and this project started out of our own needs. We will be more than happy
-to collaborate to maintain the gem alive and supporting the latest versions
-of ruby and rails, but your help is appreciated. Either by reporting bugs you
-may find or proposing improvements to the gem itself. Feel free to reach out.
 
 ## Installation
 
@@ -33,7 +30,7 @@ may find or proposing improvements to the gem itself. Feel free to reach out.
 Add the following to your Gemfile:
 
 ```ruby
-gem 'ros-apartment', require: 'apartment'
+gem 'puzzle-apartment', require: 'apartment'
 ```
 
 Then generate your `Apartment` config file using
@@ -637,6 +634,7 @@ $ APARTMENT_DISABLE_INIT=true DATABASE_URL=postgresql://localhost:1234/buk_devel
   * Copy them into the same directory but with the name `database.yml`
   * Edit them to fit your own settings
 * Rake tasks (see the Rakefile) will help you setup your dbs necessary to run tests
+* To run tests without Mysql, call `rspec -t ~database:mysql`
 * Please issue pull requests to the `development` branch. All development happens here, master is used for releases.
 * Ensure that your code is accompanied with tests. No code will be merged without tests
 
diff --git a/ros-apartment.gemspec b/puzzle-apartment.gemspec
similarity index 96%
rename from ros-apartment.gemspec
rename to puzzle-apartment.gemspec
index a4fc4cff..27028dfd 100644
--- a/ros-apartment.gemspec
+++ b/puzzle-apartment.gemspec
@@ -4,7 +4,7 @@ $LOAD_PATH << File.expand_path('lib', __dir__)
 require 'apartment/version'
 
 Gem::Specification.new do |s|
-  s.name = 'ros-apartment'
+  s.name = 'puzzle-apartment'
   s.version = Apartment::VERSION
 
   s.authors       = ['Ryan Brunner', 'Brad Robertson', 'Rui Baltazar']
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.homepage = 'https://github.com/rails-on-services/apartment'
+  s.homepage = 'https://github.com/puzzle/apartment'
   s.licenses = ['MIT']
 
   s.add_dependency 'activerecord', '>= 5.0.0', '< 7.2'