diff --git a/src/main/groovy/io/seqera/wave/tower/AccessToken.groovy b/src/main/groovy/io/seqera/wave/tower/AccessToken.groovy
index c5aa00c8a..9eeb96354 100644
--- a/src/main/groovy/io/seqera/wave/tower/AccessToken.groovy
+++ b/src/main/groovy/io/seqera/wave/tower/AccessToken.groovy
@@ -7,6 +7,7 @@ import javax.validation.constraints.Size
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import groovy.transform.CompileStatic
+import groovy.transform.ToString
 import io.micronaut.core.annotation.Nullable
 import io.micronaut.data.annotation.DateCreated
 import jakarta.persistence.Column
@@ -21,6 +22,7 @@ import jakarta.persistence.Version
  *
  * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
  */
+@ToString(includeNames = true, includePackage = false, includes = 'id,name')
 @Table(name="tw_access_token")
 @Entity
 @CompileStatic
diff --git a/src/main/groovy/io/seqera/wave/tower/Credentials.groovy b/src/main/groovy/io/seqera/wave/tower/Credentials.groovy
index f94722661..c6535288f 100644
--- a/src/main/groovy/io/seqera/wave/tower/Credentials.groovy
+++ b/src/main/groovy/io/seqera/wave/tower/Credentials.groovy
@@ -5,6 +5,7 @@ import javax.validation.constraints.NotNull
 import javax.validation.constraints.Size
 
 import groovy.transform.CompileStatic
+import groovy.transform.ToString
 import io.micronaut.core.annotation.Nullable
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
@@ -18,6 +19,7 @@ import jakarta.persistence.Version
  *
  * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
  */
+@ToString(includeNames = true, includePackage = false, includes = 'id,name,organizationId,workspaceId')
 @Table(name="tw_credentials")
 @Entity
 @CompileStatic
diff --git a/src/main/groovy/io/seqera/wave/tower/Secret.groovy b/src/main/groovy/io/seqera/wave/tower/Secret.groovy
index 1a27d9625..249158220 100644
--- a/src/main/groovy/io/seqera/wave/tower/Secret.groovy
+++ b/src/main/groovy/io/seqera/wave/tower/Secret.groovy
@@ -5,6 +5,7 @@ import java.time.OffsetDateTime
 import javax.validation.constraints.NotNull
 
 import groovy.transform.CompileStatic
+import groovy.transform.ToString
 import io.micronaut.data.annotation.DateCreated
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
@@ -17,6 +18,7 @@ import jakarta.persistence.Version
  *
  * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
  */
+@ToString(includeNames = true, includePackage = false, includes = 'id')
 @CompileStatic
 @Table(name="tw_secret")
 @Entity
diff --git a/src/main/groovy/io/seqera/wave/tower/User.groovy b/src/main/groovy/io/seqera/wave/tower/User.groovy
index e1a965b82..f8d38e210 100644
--- a/src/main/groovy/io/seqera/wave/tower/User.groovy
+++ b/src/main/groovy/io/seqera/wave/tower/User.groovy
@@ -5,6 +5,7 @@ import javax.validation.constraints.NotNull
 import javax.validation.constraints.Size
 
 import groovy.transform.CompileStatic
+import groovy.transform.ToString
 import jakarta.persistence.CascadeType
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
@@ -16,6 +17,7 @@ import jakarta.persistence.Version
  * Model a tower user
  * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
  */
+@ToString(includeNames = true, includePackage = false, includes = 'id,userName')
 @CompileStatic
 @Table(name="tw_user")
 @Entity