diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d7c83b2..d84a8b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,10 +12,14 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-latest ]
-        smalltalk: [ GemStone64-3.6.5, GemStone64-3.6.0, GemStone64-3.5.8, GemStone64-3.5.3 ]
+        os: [ ubuntu-20.04 ]
+        smalltalk: [ GemStone64-3.7.0, GemStone64-3.6.7, GemStone64-3.5.8 ]
+        include: 
+          - smalltalk: GemStone64-3.6.7
+            os: macos-latest
+          - smalltalk: GemStone64-3.5.8
+            os: macos-latest
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.smalltalk }}
     steps:
       - uses: actions/checkout@v2
       - uses: hpi-swa/setup-smalltalkCI@v1
diff --git a/repository/BaselineOfZodiac.package/BaselineOfZodiac.class/instance/projectClass.st b/repository/BaselineOfZodiac.package/BaselineOfZodiac.class/instance/projectClass.st
new file mode 100644
index 0000000..28bd1a5
--- /dev/null
+++ b/repository/BaselineOfZodiac.package/BaselineOfZodiac.class/instance/projectClass.st
@@ -0,0 +1,4 @@
+accessing
+projectClass
+  Smalltalk at: #'MetacelloCypressBaselineProject' ifPresent: [ :cl | ^ cl ].
+  ^ super projectClass