diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..025d8b5
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+* @silinternational/developers
+*.php @silinternational/php-devs
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 01b12dc..52345ce 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -18,7 +18,8 @@
 
 ---
 
-### Feature PR Checklist
+### PR Checklist
+- [ ] Put version number in PR title (e.g. `Release x.y.z - Summary of changes`)
 - [ ] Documentation (README, etc.)
 - [ ] Unit tests created or updated
 - [ ] Run `make composershow`
diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
index ede07cf..e65d95f 100644
--- a/.github/workflows/test-and-publish.yml
+++ b/.github/workflows/test-and-publish.yml
@@ -19,6 +19,7 @@ jobs:
     name: Build and Publish
     needs: tests
     runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags')
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -47,6 +48,7 @@ jobs:
             type=ref,event=branch
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
 
       - name: Build and push Docker image to Docker Hub
         uses: docker/build-push-action@v5
@@ -67,4 +69,4 @@ jobs:
             ghcr.io/${{ github.repository }}:${{ github.ref_name }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            GITHUB_REF_NAME=${{ github.ref_name }} 
\ No newline at end of file
+            GITHUB_REF_NAME=${{ github.ref_name }} 
diff --git a/Makefile b/Makefile
index bdc3638..e111010 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ psr2:
 	docker compose run --rm cli bash -c "vendor/bin/php-cs-fixer fix ."
 
 # NOTE: When running tests locally, make sure you don't exclude the integration
-#       tests (which we do when testing on Codeship).
+#       tests (which we do when testing on CI).
 test: deps unittest broker behat
 
 testci: deps broker
diff --git a/actions-services.yml b/actions-services.yml
index fff0a6b..7c85ad7 100644
--- a/actions-services.yml
+++ b/actions-services.yml
@@ -12,7 +12,7 @@ services:
             EMAIL_SERVICE_baseUrl: http://email
             EMAIL_SERVICE_validIpRanges: 192.168.0.0/16
             ID_BROKER_ADAPTER: fake
-            ID_BROKER_CONFIG_accessToken: codeship-sync-to-broker-11111111
+            ID_BROKER_CONFIG_accessToken: ci-sync-to-broker-11111111
             ID_STORE_ADAPTER: fake
             IDP_NAME: Test
 
@@ -20,7 +20,7 @@ services:
         image: silintl/idp-id-broker:latest
         environment:
             APP_ENV: test
-            API_ACCESS_KEYS: codeship-sync-to-broker-11111111
+            API_ACCESS_KEYS: ci-sync-to-broker-11111111
             EMAIL_SERVICE_accessToken: dummy
             EMAIL_SERVICE_assertValidIp: "false"
             EMAIL_SERVICE_baseUrl: http://email
diff --git a/application/features/bootstrap/IdpIdBrokerIntegrationContext.php b/application/features/bootstrap/IdpIdBrokerIntegrationContext.php
index 4004f3f..8682468 100644
--- a/application/features/bootstrap/IdpIdBrokerIntegrationContext.php
+++ b/application/features/bootstrap/IdpIdBrokerIntegrationContext.php
@@ -65,6 +65,7 @@ protected function generateDummyPassword()
     public function anActiveUserExists()
     {
         $newUser = $this->idBroker->createUser($this->testUserData);
+        Assert::assertTrue($newUser->getActive() === 'yes');
         Assert::assertNotNull($newUser);
     }