diff --git a/.travis.yml b/.travis.yml
index e89e417..c9bc7b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,3 +93,15 @@ matrix:
     - <<: *cmake-build-test
       name: "CMake atecc608a example - debug (K64F)"
       env: NAME=cmake_test TARGET_NAME=K64F PROFILE=debug CACHE_NAME=debug-K64F
+
+    - <<: *cmake-build-test
+      name: "CMake atecc608a example - develop (NRF52_DK)"
+      env: NAME=cmake_test TARGET_NAME=NRF52_DK PROFILE=develop CACHE_NAME=develop-NRF52_DK
+
+    - <<: *cmake-build-test
+      name: "CMake atecc608a example - release (NRF52_DK)"
+      env: NAME=cmake_test TARGET_NAME=NRF52_DK PROFILE=release CACHE_NAME=release-NRF52_DK
+
+    - <<: *cmake-build-test
+      name: "CMake atecc608a example - debug (NRF52_DK)"
+      env: NAME=cmake_test TARGET_NAME=NRF52_DK PROFILE=debug CACHE_NAME=debug-NRF52_DK
diff --git a/README.md b/README.md
index 75291f9..f904497 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,9 @@ The examples in this repository demonstrate how to use the ATECC608A secure elem
 
 A target with I2C and power supply connections, connected to an ATECC608A secure element as shown in [Hardware interface](#hardware-interface).
 
+Note: This example enables Mbed OS PSA. It is _not_ suitable for or compatible with TF-M which has its own PSA implementation
+(e.g. Arm TrustZone on Arm v8-M).
+
 ## Mbed OS build tools
 
 ### Mbed CLI 2
diff --git a/atecc608a/mbed_app.json b/atecc608a/mbed_app.json
index a74cce5..1ccab21 100644
--- a/atecc608a/mbed_app.json
+++ b/atecc608a/mbed_app.json
@@ -1,7 +1,8 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add" : ["EXPERIMENTAL_API"],
+            "target.features_add" : ["EXPERIMENTAL_API", "PSA"],
+            "extra_labels_add": ["MBED_PSA_SRV"],
             "platform.stdio-baud-rate": 9600,
             "platform.stdio-convert-newlines": true,
             "mbed-trace.enable": 0
@@ -9,10 +10,6 @@
         "NRF52_DK": {
             "cryptoauthlib.i2c_sda": "P0_26",
             "cryptoauthlib.i2c_scl": "P0_27"
-        },
-        "SAML21J18A": {
-            "cryptoauthlib.i2c_sda": "PA08",
-            "cryptoauthlib.i2c_scl": "PA09"
         }
     },
     "macros": [