diff --git a/.github/workflows/run_tests_on_pull_request.yml b/.github/workflows/run_tests_on_pull_request.yml
new file mode 100644
index 00000000..940e6afa
--- /dev/null
+++ b/.github/workflows/run_tests_on_pull_request.yml
@@ -0,0 +1,11 @@
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  run_tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: run tests
+        run: make all
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index fcd3ceea..8b4550c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,13 @@
-dist: xenial
+dist: focal
 language: python
-python: 3.8
-
+python: 3.9
+before_install:
+  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 script:
 - make all
-
 branches:
   except:
-  - /.*_exercise$/
+  - "/.*_exercise$/"
+env:
+  global:
+    secure: cNctlzVCjUj1oOrRW0aryxhJHB/u0b6vmn532jcgyCRS1aQjMJtT61O7tW6yMk4wOaH4Lr0kAI0J6+1lnRYf5g11H1M+IpEHGMWgJgImsysDpLRWUGmDJTez/ii8psk0SfOP/0ZwQp+QxOB92CHdPeOPOmu2HFa00V82/H7gousXR7ywQRNthLHwso36O8+UoHc4qw8nIbjcHzbfD6ysJNynmaUMlB3mRTU1hkjGKKpA2Xyl4tmkIhp3NCPJc0WR4SgB3y0u3dVOC+RtbRzl/XpEbjsZHHNloBirK+8ERn9ISBBh/mvfo6qTix743e+xvhtBlLJjk3o4H0VMH+wQ3zIpIh4TKbhPCMqWY3gvtKDVRHD+Sywk2TE6zSz0sDPWk248MC2QsL7sgeFwcnFHOWy2iKf4YyuZtoaJuX+2tw23cDCdMS6wbARlT8Kb5QwMlsxuKYN/04kQB+9nXTVsWKJGIwLKdYRzshnlzqB/UEe2vrjZcbBixCp4pbZ2jSzw2881he4KSbVGIJdZYSFetMuaN0P9obtdaJU4V+IhwzFyyapjZhEGCTl+l/m8uGdJ5DOhFlZ7OczHja7DKUuQvB3AbnMGvN518C+fJkJpWxAn5UeIp3d0ZZm32XVKt3k8PJaP7LBYdxnr3JCRit7+kNnlP7Ho0NjvX6GTHQ+r+JM=
diff --git a/README.md b/README.md
index df5c823c..8b35464c 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,25 @@
-# Example application code for the python architecture book
+# Example application code for the "Architecture Patterns with Python" book
 
 ## Chapters
 
 Each chapter has its own branch which contains all the commits for that chapter,
-so it has the state that corresponds to the _end_ of that chapter.  If you want
-to try and code along with a chapter, you'll want to check out the branch for the
-previous chapter.
+so it has the state that corresponds to the _end_ of that chapter.
+If you want to try and code along with a chapter,
+you'll want to check out the branch for the previous chapter.
 
-https://github.com/python-leap/code/branches/all
+https://github.com/cosmicpython/code/branches/all
 
 
 ## Exercises
 
-Branches for the exercises follow the convention `{chatper_name}_exercise`, eg 
-https://github.com/python-leap/code/tree/chapter_04_service_layer_exercise
+Branches for the exercises follow the convention `{chapter_name}_exercise`,
+eg https://github.com/cosmicpython/code/tree/chapter_04_service_layer_exercise
 
 
 ## Requirements
 
 * docker with docker-compose
-* for chapters 1 and 2, and optionally for the rest: a local python3.7 virtualenv
+* for chapters 1 and 2, and optionally for the rest: a local python3.8 virtualenv
 
 
 ## Building the containers
@@ -45,10 +45,10 @@ pip install pytest
 pip install pytest sqlalchemy
 
 # for chapter 4+5
-pip install requirements.txt
+pip install -r requirements.txt
 
 # for chapter 6+
-pip install requirements.txt
+pip install -r requirements.txt
 pip install -e src/
 ```
 
@@ -60,9 +60,9 @@ pip install -e src/
 ```sh
 make test
 # or, to run individual test types
-make unit
-make integration
-make e2e
+make unit-tests
+make integration-tests
+make e2e-tests
 # or, if you have a local virtualenv
 make up
 pytest tests/unit
diff --git a/requirements.txt b/requirements.txt
index 882cb352..789a24fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # app
-sqlalchemy
+sqlalchemy<2
 flask
 psycopg2-binary
 redis