diff --git a/.gitignore b/.gitignore
index 0ed2d81e..2c782154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # Ignore Gradle project-specific cache directory
 .gradle
 .idea
-
+.env
 # Ignore Gradle build output directory
 build
 **/build-info.properties
diff --git a/conf/reflect-config.json b/conf/reflect-config.json
index 52d3eb06..1c2e8265 100644
--- a/conf/reflect-config.json
+++ b/conf/reflect-config.json
@@ -172,6 +172,12 @@
   "allDeclaredMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"io.seqera.tower.cli.commands.DataLinksCmd",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"io.seqera.tower.cli.commands.DatasetsCmd",
   "allDeclaredFields":true,
@@ -978,6 +984,47 @@
   "allDeclaredMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"io.seqera.tower.cli.commands.data.links.AbstractDataLinksCmd",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"io.seqera.tower.cli.commands.data.links.AddCmd",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.tower.cli.commands.data.links.BrowseCmd",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.tower.cli.commands.data.links.DeleteCmd",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.tower.cli.commands.data.links.ListCmd",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.tower.cli.commands.data.links.SearchOption",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.tower.cli.commands.data.links.UpdateCmd",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"io.seqera.tower.cli.commands.datasets.AbstractDatasetsCmd",
   "allDeclaredFields":true,
@@ -1664,6 +1711,30 @@
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true
 },
+{
+  "name":"io.seqera.tower.cli.responses.data.DataLinkContentList",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"io.seqera.tower.cli.responses.data.DataLinkDeleted",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"io.seqera.tower.cli.responses.data.DataLinkView",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"io.seqera.tower.cli.responses.data.DataLinksList",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"io.seqera.tower.cli.responses.datasets.DatasetCreate",
   "allDeclaredFields":true,
@@ -2385,6 +2456,85 @@
   "allDeclaredMethods":true,
   "methods":[{"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"getValue","parameterTypes":[] }]
 },
+{
+  "name":"io.seqera.tower.model.DataLinkContentResponse",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"addObjectsItem","parameterTypes":["io.seqera.tower.model.DataLinkItem"] }, {"name":"getObjects","parameterTypes":[] }, {"name":"getOriginalPath","parameterTypes":[] }, {"name":"nextPageToken","parameterTypes":["java.lang.String"] }, {"name":"objects","parameterTypes":["java.util.List"] }, {"name":"originalPath","parameterTypes":["java.lang.String"] }, {"name":"setNextPageToken","parameterTypes":["java.lang.String"] }, {"name":"setObjects","parameterTypes":["java.util.List"] }, {"name":"setOriginalPath","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkCreateRequest",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"getCredentialsId","parameterTypes":[] }, {"name":"getDescription","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getProvider","parameterTypes":[] }, {"name":"getPublicAccessible","parameterTypes":[] }, {"name":"getResourceRef","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkCredentials",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"setId","parameterTypes":["java.lang.String"] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setProvider","parameterTypes":["io.seqera.tower.model.DataLinkProvider"] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkDto",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"setCredentials","parameterTypes":["java.util.List"] }, {"name":"setDescription","parameterTypes":["java.lang.String"] }, {"name":"setHidden","parameterTypes":["java.lang.Boolean"] }, {"name":"setId","parameterTypes":["java.lang.String"] }, {"name":"setMessage","parameterTypes":["java.lang.String"] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setProvider","parameterTypes":["io.seqera.tower.model.DataLinkProvider"] }, {"name":"setPublicAccessible","parameterTypes":["java.lang.Boolean"] }, {"name":"setRegion","parameterTypes":["java.lang.String"] }, {"name":"setResourceRef","parameterTypes":["java.lang.String"] }, {"name":"setStatus","parameterTypes":["io.seqera.tower.model.DataLinkStatus"] }, {"name":"setType","parameterTypes":["io.seqera.tower.model.DataLinkType"] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkItem",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"setMimeType","parameterTypes":["java.lang.String"] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setSize","parameterTypes":["java.lang.Long"] }, {"name":"setType","parameterTypes":["io.seqera.tower.model.DataLinkItemType"] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkItemType",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkProvider",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"getValue","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkResponse",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"setDataLink","parameterTypes":["io.seqera.tower.model.DataLinkDto"] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkStatus",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkType",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "methods":[{"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"getValue","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinkUpdateRequest",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"io.seqera.tower.model.DataLinksListResponse",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"setDataLinks","parameterTypes":["java.util.List"] }, {"name":"setTotalSize","parameterTypes":["java.lang.Long"] }]
+},
 {
   "name":"io.seqera.tower.model.Dataset",
   "allDeclaredFields":true,
@@ -2559,7 +2709,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getBootDiskSizeGb","parameterTypes":[] }, {"name":"getCopyImage","parameterTypes":[] }, {"name":"getCpuPlatform","parameterTypes":[] }, {"name":"getDebugMode","parameterTypes":[] }, {"name":"getDiscriminator","parameterTypes":[] }, {"name":"getEnvironment","parameterTypes":[] }, {"name":"getFusion2Enabled","parameterTypes":[] }, {"name":"getHeadJobCpus","parameterTypes":[] }, {"name":"getHeadJobMemoryMb","parameterTypes":[] }, {"name":"getLabels","parameterTypes":[] }, {"name":"getLocation","parameterTypes":[] }, {"name":"getMachineType","parameterTypes":[] }, {"name":"getNetwork","parameterTypes":[] }, {"name":"getNfsMount","parameterTypes":[] }, {"name":"getNfsTarget","parameterTypes":[] }, {"name":"getPostRunScript","parameterTypes":[] }, {"name":"getPreRunScript","parameterTypes":[] }, {"name":"getProjectId","parameterTypes":[] }, {"name":"getServiceAccount","parameterTypes":[] }, {"name":"getSpot","parameterTypes":[] }, {"name":"getSshDaemon","parameterTypes":[] }, {"name":"getSshImage","parameterTypes":[] }, {"name":"getSubnetwork","parameterTypes":[] }, {"name":"getUsePrivateAddress","parameterTypes":[] }, {"name":"getWaveEnabled","parameterTypes":[] }, {"name":"getWorkDir","parameterTypes":[] }, {"name":"getHeadJobInstanceTemplate","parameterTypes":[] }, {"name":"getComputeJobsInstanceTemplate","parameterTypes":[] }, {"name":"getLaunchDir","parameterTypes":[] }, {"name":"getUserName","parameterTypes":[] }, {"name":"getHostName","parameterTypes":[] }, {"name":"getPort","parameterTypes":[] }, {"name":"getMaxQueueSize","parameterTypes":[] }, {"name":"getHeadJobOptions","parameterTypes":[] }, {"name":"getPropagateHeadJobOptions","parameterTypes":[] }, {"name":"setBootDiskSizeGb","parameterTypes":["java.lang.Integer"] }, {"name":"setCopyImage","parameterTypes":["java.lang.String"] }, {"name":"setCpuPlatform","parameterTypes":["java.lang.String"] }, {"name":"setDebugMode","parameterTypes":["java.lang.Integer"] }, {"name":"setEnvironment","parameterTypes":["java.util.List"] }, {"name":"setFusion2Enabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setHeadJobCpus","parameterTypes":["java.lang.Integer"] }, {"name":"setHeadJobMemoryMb","parameterTypes":["java.lang.Integer"] }, {"name":"setLabels","parameterTypes":["java.util.Map"] }, {"name":"setLocation","parameterTypes":["java.lang.String"] }, {"name":"setMachineType","parameterTypes":["java.lang.String"] }, {"name":"setNetwork","parameterTypes":["java.lang.String"] }, {"name":"setNfsMount","parameterTypes":["java.lang.String"] }, {"name":"setNfsTarget","parameterTypes":["java.lang.String"] }, {"name":"setPostRunScript","parameterTypes":["java.lang.String"] }, {"name":"setPreRunScript","parameterTypes":["java.lang.String"] }, {"name":"setProjectId","parameterTypes":["java.lang.String"] }, {"name":"setServiceAccount","parameterTypes":["java.lang.String"] }, {"name":"setSpot","parameterTypes":["java.lang.Boolean"] }, {"name":"setSshDaemon","parameterTypes":["java.lang.Boolean"] }, {"name":"setSshImage","parameterTypes":["java.lang.String"] }, {"name":"setSubnetwork","parameterTypes":["java.lang.String"] }, {"name":"setUsePrivateAddress","parameterTypes":["java.lang.Boolean"] }, {"name":"setWaveEnabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setWorkDir","parameterTypes":["java.lang.String"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getBootDiskSizeGb","parameterTypes":[] }, {"name":"getComputeJobsInstanceTemplate","parameterTypes":[] }, {"name":"getCopyImage","parameterTypes":[] }, {"name":"getCpuPlatform","parameterTypes":[] }, {"name":"getDebugMode","parameterTypes":[] }, {"name":"getDiscriminator","parameterTypes":[] }, {"name":"getEnvironment","parameterTypes":[] }, {"name":"getFusion2Enabled","parameterTypes":[] }, {"name":"getHeadJobCpus","parameterTypes":[] }, {"name":"getHeadJobInstanceTemplate","parameterTypes":[] }, {"name":"getHeadJobMemoryMb","parameterTypes":[] }, {"name":"getHeadJobOptions","parameterTypes":[] }, {"name":"getHostName","parameterTypes":[] }, {"name":"getLabels","parameterTypes":[] }, {"name":"getLaunchDir","parameterTypes":[] }, {"name":"getLocation","parameterTypes":[] }, {"name":"getMachineType","parameterTypes":[] }, {"name":"getMaxQueueSize","parameterTypes":[] }, {"name":"getNetwork","parameterTypes":[] }, {"name":"getNfsMount","parameterTypes":[] }, {"name":"getNfsTarget","parameterTypes":[] }, {"name":"getPort","parameterTypes":[] }, {"name":"getPostRunScript","parameterTypes":[] }, {"name":"getPreRunScript","parameterTypes":[] }, {"name":"getProjectId","parameterTypes":[] }, {"name":"getPropagateHeadJobOptions","parameterTypes":[] }, {"name":"getServiceAccount","parameterTypes":[] }, {"name":"getSpot","parameterTypes":[] }, {"name":"getSshDaemon","parameterTypes":[] }, {"name":"getSshImage","parameterTypes":[] }, {"name":"getSubnetwork","parameterTypes":[] }, {"name":"getUsePrivateAddress","parameterTypes":[] }, {"name":"getUserName","parameterTypes":[] }, {"name":"getWaveEnabled","parameterTypes":[] }, {"name":"getWorkDir","parameterTypes":[] }, {"name":"setBootDiskSizeGb","parameterTypes":["java.lang.Integer"] }, {"name":"setCopyImage","parameterTypes":["java.lang.String"] }, {"name":"setCpuPlatform","parameterTypes":["java.lang.String"] }, {"name":"setDebugMode","parameterTypes":["java.lang.Integer"] }, {"name":"setEnvironment","parameterTypes":["java.util.List"] }, {"name":"setFusion2Enabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setHeadJobCpus","parameterTypes":["java.lang.Integer"] }, {"name":"setHeadJobMemoryMb","parameterTypes":["java.lang.Integer"] }, {"name":"setLabels","parameterTypes":["java.util.Map"] }, {"name":"setLocation","parameterTypes":["java.lang.String"] }, {"name":"setMachineType","parameterTypes":["java.lang.String"] }, {"name":"setNetwork","parameterTypes":["java.lang.String"] }, {"name":"setNfsMount","parameterTypes":["java.lang.String"] }, {"name":"setNfsTarget","parameterTypes":["java.lang.String"] }, {"name":"setPostRunScript","parameterTypes":["java.lang.String"] }, {"name":"setPreRunScript","parameterTypes":["java.lang.String"] }, {"name":"setProjectId","parameterTypes":["java.lang.String"] }, {"name":"setServiceAccount","parameterTypes":["java.lang.String"] }, {"name":"setSpot","parameterTypes":["java.lang.Boolean"] }, {"name":"setSshDaemon","parameterTypes":["java.lang.Boolean"] }, {"name":"setSshImage","parameterTypes":["java.lang.String"] }, {"name":"setSubnetwork","parameterTypes":["java.lang.String"] }, {"name":"setUsePrivateAddress","parameterTypes":["java.lang.Boolean"] }, {"name":"setWaveEnabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setWorkDir","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"io.seqera.tower.model.GoogleLifeSciencesConfig",
@@ -2875,7 +3025,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getAllowInstanceCredentials","parameterTypes":[] }, {"name":"getAllowLocalRepos","parameterTypes":[] }, {"name":"getAnalytics","parameterTypes":[] }, {"name":"getApiVersion","parameterTypes":[] }, {"name":"getArm64Enabled","parameterTypes":[] }, {"name":"getAuthTypes","parameterTypes":[] }, {"name":"getCommitId","parameterTypes":[] }, {"name":"getContentMaxFileSize","parameterTypes":[] }, {"name":"getContentUrl","parameterTypes":[] }, {"name":"getDataExplorerAllowedWorkspaces","parameterTypes":[] }, {"name":"getEvalWorkspaceIds","parameterTypes":[] }, {"name":"getForgePrefix","parameterTypes":[] }, {"name":"getGroundswellAllowedWorkspaces","parameterTypes":[] }, {"name":"getGroundswellEnabled","parameterTypes":[] }, {"name":"getHeartbeatInterval","parameterTypes":[] }, {"name":"getLandingUrl","parameterTypes":[] }, {"name":"getLoginPath","parameterTypes":[] }, {"name":"getNavbar","parameterTypes":[] }, {"name":"getSeqeraCloud","parameterTypes":[] }, {"name":"getTermsOfUseUrl","parameterTypes":[] }, {"name":"getUserWorkspaceEnabled","parameterTypes":[] }, {"name":"getVersion","parameterTypes":[] }, {"name":"getWaveAllowedWorkspaces","parameterTypes":[] }, {"name":"getWaveEnabled","parameterTypes":[] }, {"name":"setAllowInstanceCredentials","parameterTypes":["java.lang.Boolean"] }, {"name":"setAllowLocalRepos","parameterTypes":["java.lang.Boolean"] }, {"name":"setAnalytics","parameterTypes":["io.seqera.tower.model.Analytics"] }, {"name":"setApiVersion","parameterTypes":["java.lang.String"] }, {"name":"setArm64Enabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setAuthTypes","parameterTypes":["java.util.List"] }, {"name":"setCommitId","parameterTypes":["java.lang.String"] }, {"name":"setContentMaxFileSize","parameterTypes":["java.lang.Long"] }, {"name":"setContentUrl","parameterTypes":["java.lang.String"] }, {"name":"setDataExplorerAllowedWorkspaces","parameterTypes":["java.util.List"] }, {"name":"setEvalWorkspaceIds","parameterTypes":["java.util.List"] }, {"name":"setForgePrefix","parameterTypes":["java.lang.String"] }, {"name":"setGroundswellAllowedWorkspaces","parameterTypes":["java.util.List"] }, {"name":"setGroundswellEnabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setHeartbeatInterval","parameterTypes":["java.lang.Integer"] }, {"name":"setLandingUrl","parameterTypes":["java.lang.String"] }, {"name":"setLoginPath","parameterTypes":["java.lang.String"] }, {"name":"setNavbar","parameterTypes":["io.seqera.tower.model.NavbarConfig"] }, {"name":"setSeqeraCloud","parameterTypes":["java.lang.Boolean"] }, {"name":"setTermsOfUseUrl","parameterTypes":["java.lang.String"] }, {"name":"setUserWorkspaceEnabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setVersion","parameterTypes":["java.lang.String"] }, {"name":"setWaveAllowedWorkspaces","parameterTypes":["java.util.List"] }, {"name":"setWaveEnabled","parameterTypes":["java.lang.Boolean"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getAllowInstanceCredentials","parameterTypes":[] }, {"name":"getAllowLocalRepos","parameterTypes":[] }, {"name":"getAnalytics","parameterTypes":[] }, {"name":"getApiVersion","parameterTypes":[] }, {"name":"getArm64Enabled","parameterTypes":[] }, {"name":"getAuthTypes","parameterTypes":[] }, {"name":"getCommitId","parameterTypes":[] }, {"name":"getContentMaxFileSize","parameterTypes":[] }, {"name":"getContentUrl","parameterTypes":[] }, {"name":"getDataExplorerAllowedWorkspaces","parameterTypes":[] }, {"name":"getEvalWorkspaceIds","parameterTypes":[] }, {"name":"getForgePrefix","parameterTypes":[] }, {"name":"getGroundswellAllowedWorkspaces","parameterTypes":[] }, {"name":"getGroundswellEnabled","parameterTypes":[] }, {"name":"getHeartbeatInterval","parameterTypes":[] }, {"name":"getLandingUrl","parameterTypes":[] }, {"name":"getLoginPath","parameterTypes":[] }, {"name":"getNavbar","parameterTypes":[] }, {"name":"getSeqeraCloud","parameterTypes":[] }, {"name":"getTermsOfUseUrl","parameterTypes":[] }, {"name":"getUserWorkspaceEnabled","parameterTypes":[] }, {"name":"getVersion","parameterTypes":[] }, {"name":"getWaveAllowedWorkspaces","parameterTypes":[] }, {"name":"getWaveEnabled","parameterTypes":[] }, {"name":"setAllowInstanceCredentials","parameterTypes":["java.lang.Boolean"] }, {"name":"setAllowLocalRepos","parameterTypes":["java.lang.Boolean"] }, {"name":"setAllowNextflowCliLogs","parameterTypes":["java.lang.Boolean"] }, {"name":"setAnalytics","parameterTypes":["io.seqera.tower.model.Analytics"] }, {"name":"setApiVersion","parameterTypes":["java.lang.String"] }, {"name":"setArm64Enabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setAuthTypes","parameterTypes":["java.util.List"] }, {"name":"setCommitId","parameterTypes":["java.lang.String"] }, {"name":"setContactEmail","parameterTypes":["java.lang.String"] }, {"name":"setContentMaxFileSize","parameterTypes":["java.lang.Long"] }, {"name":"setContentUrl","parameterTypes":["java.lang.String"] }, {"name":"setDataExplorerAllowedWorkspaces","parameterTypes":["java.util.List"] }, {"name":"setEvalWorkspaceIds","parameterTypes":["java.util.List"] }, {"name":"setForgePrefix","parameterTypes":["java.lang.String"] }, {"name":"setGroundswellAllowedWorkspaces","parameterTypes":["java.util.List"] }, {"name":"setGroundswellEnabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setHeartbeatInterval","parameterTypes":["java.lang.Integer"] }, {"name":"setLandingUrl","parameterTypes":["java.lang.String"] }, {"name":"setLoginPath","parameterTypes":["java.lang.String"] }, {"name":"setNavbar","parameterTypes":["io.seqera.tower.model.NavbarConfig"] }, {"name":"setSeqeraCloud","parameterTypes":["java.lang.Boolean"] }, {"name":"setTermsOfUseUrl","parameterTypes":["java.lang.String"] }, {"name":"setUserWorkspaceEnabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setVersion","parameterTypes":["java.lang.String"] }, {"name":"setWaveAllowedWorkspaces","parameterTypes":["java.util.List"] }, {"name":"setWaveEnabled","parameterTypes":["java.lang.Boolean"] }]
 },
 {
   "name":"io.seqera.tower.model.ServiceInfoResponse",
diff --git a/conf/resource-config.json b/conf/resource-config.json
index d7a04dc3..020e4d91 100644
--- a/conf/resource-config.json
+++ b/conf/resource-config.json
@@ -8,6 +8,8 @@
     "pattern":"\\QMETA-INF/services/org.glassfish.jersey.internal.inject.InjectionManagerFactory\\E"
   }, {
     "pattern":"\\QMETA-INF/services/org.glassfish.jersey.internal.spi.AutoDiscoverable\\E"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/nfc.nrm\\E"
   }, {
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/nfkc.nrm\\E"
   }, {
diff --git a/src/main/java/io/seqera/tower/cli/Tower.java b/src/main/java/io/seqera/tower/cli/Tower.java
index a84b820d..ecfc0d65 100644
--- a/src/main/java/io/seqera/tower/cli/Tower.java
+++ b/src/main/java/io/seqera/tower/cli/Tower.java
@@ -26,6 +26,7 @@
 import io.seqera.tower.cli.commands.CollaboratorsCmd;
 import io.seqera.tower.cli.commands.ComputeEnvsCmd;
 import io.seqera.tower.cli.commands.CredentialsCmd;
+import io.seqera.tower.cli.commands.DataLinksCmd;
 import io.seqera.tower.cli.commands.DatasetsCmd;
 import io.seqera.tower.cli.commands.InfoCmd;
 import io.seqera.tower.cli.commands.LaunchCmd;
@@ -58,6 +59,7 @@
                 CollaboratorsCmd.class,
                 ComputeEnvsCmd.class,
                 CredentialsCmd.class,
+                DataLinksCmd.class,
                 DatasetsCmd.class,
                 GenerateCompletion.class,
                 InfoCmd.class,
diff --git a/src/main/java/io/seqera/tower/cli/commands/AbstractApiCmd.java b/src/main/java/io/seqera/tower/cli/commands/AbstractApiCmd.java
index 46a5dff2..b8436b54 100644
--- a/src/main/java/io/seqera/tower/cli/commands/AbstractApiCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/AbstractApiCmd.java
@@ -31,8 +31,10 @@
 import io.seqera.tower.cli.exceptions.WorkspaceNotFoundException;
 import io.seqera.tower.cli.responses.Response;
 import io.seqera.tower.model.ActionQueryAttribute;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.ComputeEnvQueryAttribute;
 import io.seqera.tower.model.ComputeEnvResponseDto;
+import io.seqera.tower.model.Credentials;
 import io.seqera.tower.model.ListComputeEnvsResponseEntry;
 import io.seqera.tower.model.ListWorkspacesAndOrgResponse;
 import io.seqera.tower.model.OrgAndWorkspaceDto;
@@ -273,6 +275,27 @@ protected ComputeEnvResponseDto primaryComputeEnv(Long workspaceId) throws ApiEx
         return api().describeComputeEnv(primaryComputeEnvId, workspaceId, NO_CE_ATTRIBUTES).getComputeEnv();
     }
 
+    protected String credentialsByRef(ComputeEnvComputeConfig.PlatformEnum type, Long wspId, String credentialsRef) throws ApiException {
+        List<Credentials> credentials = api().listCredentials(wspId, type == null ? null : type.getValue()).getCredentials();
+
+        if (credentials.isEmpty()) {
+            throw new TowerException("No valid credentials found at the workspace");
+        }
+
+        Credentials cred;
+
+        cred = credentials.stream()
+                .filter(it -> Objects.equals(it.getId(), credentialsRef) || Objects.equals(it.getName(), credentialsRef))
+                .findFirst()
+                .orElse(null);
+
+        if (cred == null) {
+            throw new TowerException("No valid credentials found at the workspace");
+        }
+
+        return cred.getId();
+    }
+
     protected String serverUrl() {
         if (serverUrl == null) {
             serverUrl = app().url.replaceFirst("api\\.", "").replaceFirst("/api", "");
diff --git a/src/main/java/io/seqera/tower/cli/commands/DataLinksCmd.java b/src/main/java/io/seqera/tower/cli/commands/DataLinksCmd.java
new file mode 100644
index 00000000..9150de9e
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/commands/DataLinksCmd.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.commands;
+
+import io.seqera.tower.cli.commands.data.links.AddCmd;
+import io.seqera.tower.cli.commands.data.links.DeleteCmd;
+import io.seqera.tower.cli.commands.data.links.ListCmd;
+import io.seqera.tower.cli.commands.data.links.UpdateCmd;
+import io.seqera.tower.cli.commands.data.links.BrowseCmd;
+import picocli.CommandLine;
+
+@CommandLine.Command(
+        name = "data-links",
+        description = "Manage data links.",
+        subcommands = {
+                ListCmd.class,
+                AddCmd.class,
+                DeleteCmd.class,
+                UpdateCmd.class,
+                BrowseCmd.class
+        }
+)
+public class DataLinksCmd extends AbstractRootCmd {
+}
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
index 7bf57360..8878edf0 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
@@ -137,27 +137,6 @@ private List<Long> findLabels(Long wspId, List<Label> labels) throws ApiExceptio
         }
     }
 
-    private String credentialsByRef(PlatformEnum type, Long wspId, String credentialsRef) throws ApiException {
-        List<Credentials> credentials = api().listCredentials(wspId, type.getValue()).getCredentials();
-
-        if (credentials.isEmpty()) {
-            throw new TowerException("No valid credentials found at the workspace");
-        }
-
-        Credentials cred;
-
-        cred = credentials.stream()
-                .filter(it -> Objects.equals(it.getId(), credentialsRef) || Objects.equals(it.getName(), credentialsRef))
-                .findFirst()
-                .orElse(null);
-
-        if (cred == null) {
-            throw new TowerException("No valid credentials found at the workspace");
-        }
-
-        return cred.getId();
-    }
-
     private String findWorkspaceCredentials(PlatformEnum type, Long wspId) throws ApiException {
         List<Credentials> credentials = api().listCredentials(wspId, type.getValue()).getCredentials();
         if (credentials.isEmpty()) {
diff --git a/src/main/java/io/seqera/tower/cli/commands/data/links/AddCmd.java b/src/main/java/io/seqera/tower/cli/commands/data/links/AddCmd.java
new file mode 100644
index 00000000..efe738f4
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/commands/data/links/AddCmd.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.commands.data.links;
+
+import io.seqera.tower.ApiException;
+import io.seqera.tower.cli.commands.AbstractApiCmd;
+import io.seqera.tower.cli.commands.global.WorkspaceOptionalOptions;
+import io.seqera.tower.cli.responses.Response;
+import io.seqera.tower.cli.responses.data.DataLinkView;
+import io.seqera.tower.cli.utils.data.DataLinkProvider;
+import io.seqera.tower.model.DataLinkCreateRequest;
+import io.seqera.tower.model.DataLinkDto;
+import io.seqera.tower.model.DataLinkType;
+import picocli.CommandLine;
+
+import java.io.IOException;
+import java.util.Objects;
+
+@CommandLine.Command(
+        name = "add",
+        description = "Add custom data link."
+)
+public class AddCmd extends AbstractApiCmd {
+
+    @CommandLine.Mixin
+    public WorkspaceOptionalOptions workspace;
+
+    @CommandLine.Option(names = {"-n", "--name"}, description = "Data link name.", required = true)
+    public String name;
+
+    @CommandLine.Option(names = {"-d", "--description"}, description = "Data link description.")
+    public String description;
+
+    @CommandLine.Option(names = {"-u", "--uri"}, description = "Data link uri.", required = true)
+    public String url;
+
+    @CommandLine.Option(names = {"-p", "--provider"}, description = "Data link provider. [aws, azure, google]", required = true)
+    public DataLinkProvider provider;
+
+    @CommandLine.Option(names = {"-c", "--credentials"}, description = "Credentials identifier.")
+    public String credentialsRef;
+
+
+    @Override
+    protected Response exec() throws ApiException, IOException {
+        Long wspId = workspaceId(workspace.workspace);
+        String credId = credentialsRef != null ? credentialsByRef(null, wspId, credentialsRef) : null;
+        DataLinkDto created = addDataLink(wspId, name, description, url, provider.name(), credId);
+
+        if (Objects.isNull(created)) {
+            app().getOut().println("Data link creation failed.");
+            return null;
+        }
+
+        return new DataLinkView(created, "Data link created");
+    }
+
+    DataLinkDto addDataLink(Long wspId, String name, String description, String url, String provider, String credsId) throws ApiException {
+        DataLinkCreateRequest req = new DataLinkCreateRequest();
+        req.name(name);
+        req.description(description);
+        req.resourceRef(url);
+        req.type(DataLinkType.BUCKET);
+        req.provider(io.seqera.tower.model.DataLinkProvider.fromValue(provider.toLowerCase()));
+
+        if (Objects.isNull(credsId)) {
+            req.publicAccessible(true);
+        } else {
+            req.publicAccessible(false);
+            req.credentialsId(credsId);
+        }
+
+        return api().createCustomDataLink(req, wspId);
+    }
+
+
+}
diff --git a/src/main/java/io/seqera/tower/cli/commands/data/links/BrowseCmd.java b/src/main/java/io/seqera/tower/cli/commands/data/links/BrowseCmd.java
new file mode 100644
index 00000000..f56c0154
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/commands/data/links/BrowseCmd.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.commands.data.links;
+
+import io.seqera.tower.ApiException;
+import io.seqera.tower.StringUtil;
+import io.seqera.tower.cli.commands.AbstractApiCmd;
+import io.seqera.tower.cli.commands.global.WorkspaceOptionalOptions;
+import io.seqera.tower.cli.responses.Response;
+import io.seqera.tower.cli.responses.data.DataLinkContentList;
+import io.seqera.tower.model.DataLinkContentResponse;
+import io.seqera.tower.model.DataLinkDto;
+import picocli.CommandLine;
+
+import java.io.IOException;
+
+@CommandLine.Command(
+        name = "browse",
+        description = "Browse content of data link."
+)
+public class BrowseCmd extends AbstractApiCmd {
+
+    @CommandLine.Mixin
+    public WorkspaceOptionalOptions workspace;
+
+    @CommandLine.Option(names = {"-i", "--id"}, description = "Data link id.", required = true)
+    public String id;
+
+    @CommandLine.Option(names = {"-c", "--credentials"}, description = "Credentials identifier.")
+    public String credentialsRef;
+
+    @CommandLine.Option(names = {"-p", "--path"}, description = "Path to the folder to browse.")
+    public String path;
+
+    @CommandLine.Option(names = {"-f", "--filter"}, description = "Filter files with the given prefix.")
+    public String startsWith;
+
+    @CommandLine.Option(names = {"-t", "--token"}, description = "Next page token to fetch next page.")
+    public String nextPageToken;
+
+    @CommandLine.Option(names = {"--page"}, description = "Pages to display [default: null].")
+    public Integer page;
+
+    @Override
+    protected Response exec() throws ApiException, IOException {
+        Long wspId = workspaceId(workspace.workspace);
+        String credId = credentialsRef != null ? credentialsByRef(null, wspId, credentialsRef) : null;
+        DataLinkDto dataLink = api().describeDataLink(id, wspId, credId).getDataLink();
+        DataLinkContentResponse response;
+
+        if (path != null)
+            response = api().exploreDataLink1(id, path, wspId, credId, startsWith, nextPageToken, page);
+        else
+            response = api().exploreDataLink(id, wspId, credId, startsWith, nextPageToken, page);
+
+        return new DataLinkContentList(dataLink, path, response.getObjects(), response.getNextPageToken());
+    }
+
+}
diff --git a/src/main/java/io/seqera/tower/cli/commands/data/links/DeleteCmd.java b/src/main/java/io/seqera/tower/cli/commands/data/links/DeleteCmd.java
new file mode 100644
index 00000000..67823a2a
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/commands/data/links/DeleteCmd.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.commands.data.links;
+
+import io.seqera.tower.ApiException;
+import io.seqera.tower.cli.commands.AbstractApiCmd;
+import io.seqera.tower.cli.commands.global.WorkspaceOptionalOptions;
+import io.seqera.tower.cli.responses.Response;
+import io.seqera.tower.cli.responses.data.DataLinkDeleted;
+import picocli.CommandLine;
+
+import java.io.IOException;
+
+@CommandLine.Command(
+        name = "delete",
+        description = "Delete custom data link."
+)
+public class DeleteCmd extends AbstractApiCmd {
+
+    @CommandLine.Mixin
+    public WorkspaceOptionalOptions workspace;
+
+    @CommandLine.Option(names = {"-i", "--id"}, description = "Data link id.", required = true)
+    public String id;
+
+    @Override
+    protected Response exec() throws ApiException, IOException {
+        Long wspId = workspaceId(workspace.workspace);
+
+        api().deleteCustomDataLink(id, wspId);
+        return new DataLinkDeleted(id, wspId);
+    }
+}
diff --git a/src/main/java/io/seqera/tower/cli/commands/data/links/ListCmd.java b/src/main/java/io/seqera/tower/cli/commands/data/links/ListCmd.java
new file mode 100644
index 00000000..1f18624b
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/commands/data/links/ListCmd.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.commands.data.links;
+
+import io.seqera.tower.ApiException;
+import io.seqera.tower.cli.commands.AbstractApiCmd;
+import io.seqera.tower.cli.commands.enums.OutputType;
+import io.seqera.tower.cli.commands.global.PaginationOptions;
+import io.seqera.tower.cli.commands.global.WorkspaceOptionalOptions;
+import io.seqera.tower.cli.responses.Response;
+import io.seqera.tower.cli.responses.data.DataLinksList;
+import io.seqera.tower.cli.utils.PaginationInfo;
+import io.seqera.tower.cli.utils.ResponseHelper;
+import io.seqera.tower.cli.utils.data.DataLinkProvider;
+import io.seqera.tower.model.DataLinksListResponse;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+import java.io.IOException;
+import java.util.List;
+
+@Command(
+        name = "list",
+        description = "List data links."
+)
+public class ListCmd extends AbstractApiCmd {
+
+    @CommandLine.Mixin
+    public WorkspaceOptionalOptions workspace;
+
+    @CommandLine.Mixin
+    public PaginationOptions paginationOptions;
+
+    @CommandLine.Option(names = {"-c", "--credentials"}, description = "Credentials identifier.")
+    public String credentialsRef;
+
+    @CommandLine.Option(names = {"--wait"}, description = "When present program will wait till all data links are fetched to cache.")
+    public boolean wait;
+
+    @CommandLine.Option(names = {"--visibility"}, description = "Show  only data links that are [hidden, visible, all]. When not present all will be shown.")
+    public Visibility visibilityOption;
+
+    // Search params
+    @CommandLine.Mixin
+    public SearchOption searchOption;
+
+
+    @Override
+    protected Response exec() throws ApiException, IOException {
+        Integer max = PaginationOptions.getMax(paginationOptions);
+        Integer offset = PaginationOptions.getOffset(paginationOptions, max);
+        Long wspId = workspaceId(workspace.workspace);
+        String credId = credentialsRef != null ? credentialsByRef(null, wspId, credentialsRef) : null;
+        String provider = searchOption.providers == null ? null : formatProviders(searchOption.providers);
+        String search = buildSearch(searchOption.startsWith, provider, searchOption.region, searchOption.uri);
+        String visibility = visibilityOption == null ? null : visibilityOption.toString();
+
+        DataLinksFetchStatus status = checkDataLinksFetchStatus(wspId, credId);
+        if (wait && status == DataLinksFetchStatus.FETCHING) {
+            waitForDoneStatus(wspId, credId);
+        }
+
+        boolean isResultIncomplete = !wait && status == DataLinksFetchStatus.FETCHING;
+
+        DataLinksListResponse data = api().listDataLinks(wspId, credId, search, max, offset, visibility);
+        return new DataLinksList(workspaceRef(wspId), data.getDataLinks(),
+                isResultIncomplete,
+                PaginationInfo.from(offset, max, data.getTotalSize()));
+    }
+
+    private void waitForDoneStatus(Long wspId, String credId) {
+        try {
+            ResponseHelper.waitStatus(
+                    app().getOut(),
+                    app().output != OutputType.json,
+                    DataLinksFetchStatus.DONE,
+                    DataLinksFetchStatus.values(),
+                    () -> checkDataLinksFetchStatus(wspId, credId),
+                    DataLinksFetchStatus.DONE, DataLinksFetchStatus.ERROR
+            );
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static String formatProviders(List<DataLinkProvider> providers) {
+        if (providers == null || providers.isEmpty()) {
+            return null;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (DataLinkProvider provider : providers) {
+            if (builder.length() > 0) {
+                builder.append(",");
+            }
+            builder.append(provider);
+        }
+        return builder.toString();
+    }
+
+    public static String buildSearch(String name, String providers, String region, String uri) {
+        StringBuilder builder = new StringBuilder();
+        if (name != null && !name.isBlank()) {
+            builder.append(name);
+        }
+        if (providers != null && !providers.isBlank()) {
+            appendParameter(builder, providers, "provider");
+        }
+        if (region != null && !region.isBlank()) {
+            appendParameter(builder, region, "region");
+        }
+        if (uri != null && !uri.isBlank()) {
+            appendParameter(builder, uri, "resourceRef");
+        }
+        if (builder.length() > 0)
+            return builder.toString();
+        return null;
+    }
+
+    private static void appendParameter(StringBuilder input, String param, String paramName) {
+        if (param != null && !param.isBlank()) {
+            if (input.length() > 0) {
+                input.append(" ");
+            }
+            input.append(paramName).append(":").append(param);
+        }
+    }
+
+    enum Visibility {
+        hidden, visible, all
+    }
+
+    DataLinksFetchStatus checkDataLinksFetchStatus(Long wspId, String credentialsId) {
+        int status = 0;
+        try {
+            status = api().listDataLinksWithHttpInfo(wspId, credentialsId, null, 1, 0, null).getStatusCode();
+        } catch (ApiException e) {
+            return DataLinksFetchStatus.ERROR;
+        }
+        switch (status) {
+            case 200:
+                return DataLinksFetchStatus.DONE;
+            case 202:
+                return DataLinksFetchStatus.FETCHING;
+            default:
+                return DataLinksFetchStatus.ERROR;
+        }
+    }
+
+    public enum DataLinksFetchStatus {
+        FETCHING, DONE, ERROR
+    }
+}
diff --git a/src/main/java/io/seqera/tower/cli/commands/data/links/SearchOption.java b/src/main/java/io/seqera/tower/cli/commands/data/links/SearchOption.java
new file mode 100644
index 00000000..4a2f94d2
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/commands/data/links/SearchOption.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.commands.data.links;
+
+import io.seqera.tower.cli.utils.data.DataLinkProvider;
+import picocli.CommandLine;
+
+import java.util.List;
+
+public class SearchOption {
+
+    @CommandLine.Option(names = {"-n", "--name"}, description = "Show only data links with names that start with the given word.")
+    public String startsWith;
+
+    @CommandLine.Option(names = {"-r", "--region"}, description = "Show only data links belonging to given region")
+    public String region;
+
+    @CommandLine.Option(names = {"-p", "--providers"}, description = "Show only data links belonging to given providers. [aws,azure,google]", split = ",")
+    public List<DataLinkProvider> providers;
+
+    @CommandLine.Option(names = {"-u", "--uri"}, description = "Show only data links with URI (resource reference) that start with the given URI.")
+    public String uri;
+
+}
diff --git a/src/main/java/io/seqera/tower/cli/commands/data/links/UpdateCmd.java b/src/main/java/io/seqera/tower/cli/commands/data/links/UpdateCmd.java
new file mode 100644
index 00000000..80439213
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/commands/data/links/UpdateCmd.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.commands.data.links;
+
+import io.seqera.tower.ApiException;
+import io.seqera.tower.cli.commands.AbstractApiCmd;
+import io.seqera.tower.cli.commands.global.WorkspaceOptionalOptions;
+import io.seqera.tower.cli.responses.Response;
+import io.seqera.tower.cli.responses.data.DataLinkView;
+import io.seqera.tower.model.DataLinkDto;
+import io.seqera.tower.model.DataLinkUpdateRequest;
+import picocli.CommandLine;
+
+import java.io.IOException;
+import java.util.Objects;
+
+@CommandLine.Command(
+        name = "update",
+        description = "Update custom data link."
+)
+public class UpdateCmd extends AbstractApiCmd {
+    @CommandLine.Mixin
+    public WorkspaceOptionalOptions workspace;
+
+    @CommandLine.Option(names = {"-i", "--id"}, description = "Data link id.", required = true)
+    public String id;
+
+    @CommandLine.Option(names = {"-n", "--name"}, description = "Data link name.", required = true)
+    public String name;
+
+    @CommandLine.Option(names = {"-d", "--description"}, description = "Data link description.")
+    public String description;
+
+    @CommandLine.Option(names = {"-c", "--credentials"}, description = "Credentials identifier.")
+    public String credentialsRef;
+
+
+    @Override
+    protected Response exec() throws ApiException, IOException {
+        Long wspId = workspaceId(workspace.workspace);
+        String credId = credentialsRef != null ? credentialsByRef(null, wspId, credentialsRef) : null;
+        DataLinkDto updated = updateDataLink(wspId, id, name, description, credId);
+
+        if (Objects.isNull(updated)) {
+            app().getOut().println("Data link update failed.");
+            return null;
+        }
+
+        return new DataLinkView(updated, "Data link updated");
+    }
+
+    DataLinkDto updateDataLink(Long wspId, String id, String name, String description, String credsId) throws ApiException {
+        DataLinkUpdateRequest req = new DataLinkUpdateRequest();
+        if (name != null)
+            req.name(name);
+        if (description != null)
+            req.description(description);
+        if (credsId != null)
+            req.credentialsId(credsId);
+
+        return api().updateCustomDataLink(id, req, wspId);
+    }
+}
diff --git a/src/main/java/io/seqera/tower/cli/responses/data/DataLinkContentList.java b/src/main/java/io/seqera/tower/cli/responses/data/DataLinkContentList.java
new file mode 100644
index 00000000..ed86ef61
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/responses/data/DataLinkContentList.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.responses.data;
+
+import io.seqera.tower.cli.responses.Response;
+import io.seqera.tower.cli.utils.TableList;
+import io.seqera.tower.model.DataLinkDto;
+import io.seqera.tower.model.DataLinkItem;
+
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.Objects;
+
+public class DataLinkContentList extends Response {
+
+    public final DataLinkDto dataLink;
+    public final String path;
+    public final List<DataLinkItem> items;
+    public final String nextPageToken;
+
+    public DataLinkContentList(DataLinkDto dataLink, String path, List<DataLinkItem> items, String nextPageToken) {
+        this.dataLink = dataLink;
+        this.path = path;
+        this.items = items;
+        this.nextPageToken = nextPageToken;
+    }
+
+    @Override
+    public void toString(PrintWriter out) {
+        out.println(ansi(String.format("%n  @|bold Content of '%s' and path '%s':|@%n", dataLink.getResourceRef(), path)));
+
+        TableList table = new TableList(out, 3,  "Type", "Name", "Size").sortBy(0);
+
+        items.forEach(item -> {
+            long size = item.getSize() != null ? item.getSize() : 0L;
+            table.addRow(
+                    Objects.requireNonNull(item.getType()).getValue(),
+                    item.getName(),
+                    String.valueOf(size)
+            );
+        });
+
+        table.print();
+
+        if (nextPageToken != null)
+            out.println(ansi(String.format("%n  @|bold Next page token to fetch the next page: %s|@%n", nextPageToken)));
+
+        out.println("");
+    }
+}
diff --git a/src/main/java/io/seqera/tower/cli/responses/data/DataLinkDeleted.java b/src/main/java/io/seqera/tower/cli/responses/data/DataLinkDeleted.java
new file mode 100644
index 00000000..5e97ab37
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/responses/data/DataLinkDeleted.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.responses.data;
+
+import io.seqera.tower.cli.responses.Response;
+
+public class DataLinkDeleted extends Response {
+
+    public final String id;
+    public final Long wspId;
+
+    public DataLinkDeleted(String id, Long wspId) {
+        this.id = id;
+        this.wspId = wspId;
+    }
+
+    @Override
+    public String toString() {
+        if (wspId != null) {
+            return ansi(String.format("%n  @|yellow Data link '%s' deleted at '%s' workspace.|@%n", id, wspId));
+        }
+        return ansi(String.format("%n  @|yellow Data link '%s' deleted at user workspace.|@%n", id));
+    }
+}
diff --git a/src/main/java/io/seqera/tower/cli/responses/data/DataLinkView.java b/src/main/java/io/seqera/tower/cli/responses/data/DataLinkView.java
new file mode 100644
index 00000000..2f2c5f5c
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/responses/data/DataLinkView.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.responses.data;
+
+import io.seqera.tower.cli.responses.Response;
+import io.seqera.tower.cli.utils.TableList;
+import io.seqera.tower.model.DataLinkDto;
+
+import java.io.PrintWriter;
+import java.util.Objects;
+
+public class DataLinkView extends Response {
+
+    public final DataLinkDto dataLink;
+
+    public final String message;
+
+    public DataLinkView(DataLinkDto dataLink, String message) {
+        this.dataLink = dataLink;
+        this.message = message;
+    }
+
+    @Override
+    public void toString(PrintWriter out) {
+
+        out.println(ansi(String.format("%n  @|bold %s:|@%n", message)));
+
+        TableList table = new TableList(out, 5, "ID", "Provider", "Name", "Resource ref", "Region").sortBy(0);
+
+        table.addRow(
+                dataLink.getId(),
+                Objects.requireNonNull(dataLink.getProvider()).toString(),
+                dataLink.getName(),
+                dataLink.getResourceRef(),
+                dataLink.getRegion()
+        );
+
+        table.print();
+
+        out.println("");
+    }
+
+}
diff --git a/src/main/java/io/seqera/tower/cli/responses/data/DataLinksList.java b/src/main/java/io/seqera/tower/cli/responses/data/DataLinksList.java
new file mode 100644
index 00000000..9b4d8eee
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/responses/data/DataLinksList.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.responses.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.seqera.tower.cli.responses.Response;
+import io.seqera.tower.cli.utils.PaginationInfo;
+import io.seqera.tower.cli.utils.TableList;
+import io.seqera.tower.model.DataLinkDto;
+
+import javax.annotation.Nullable;
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.Objects;
+
+public class DataLinksList extends Response {
+
+    public final String workspaceRef;
+    public final List<DataLinkDto> dataLinks;
+
+    public final boolean showFetchingInfo;
+
+    @JsonIgnore
+    @Nullable
+    private PaginationInfo paginationInfo;
+
+    public DataLinksList(String workspaceRef, List<DataLinkDto> dataLinks,
+                         boolean showFetchingInfo, @Nullable PaginationInfo paginationInfo) {
+        this.workspaceRef = workspaceRef;
+        this.dataLinks = dataLinks;
+        this.paginationInfo = paginationInfo;
+        this.showFetchingInfo = showFetchingInfo;
+    }
+
+    @Override
+    public void toString(PrintWriter out) {
+
+        out.println(ansi(String.format("%n  @|bold Data links at %s workspace:|@%n", workspaceRef)));
+
+        if (showFetchingInfo) {
+            out.println("Data links are being fetched: result might be incomplete, launch the command again to check the status");
+        }
+
+        if (dataLinks.isEmpty()) {
+            out.println(ansi("    @|yellow No data links found|@"));
+            return;
+        }
+
+        TableList table = new TableList(out, 5, "ID", "Provider", "Name", "Resource ref", "Region").sortBy(0);
+
+        dataLinks.forEach(dl -> table.addRow(
+                dl.getId(),
+                Objects.requireNonNull(dl.getProvider()).toString(),
+                dl.getName(),
+                dl.getResourceRef(),
+                dl.getRegion()
+        ));
+
+        table.print();
+
+        PaginationInfo.addFooter(out, paginationInfo);
+
+        out.println("");
+    }
+}
diff --git a/src/main/java/io/seqera/tower/cli/utils/ResponseHelper.java b/src/main/java/io/seqera/tower/cli/utils/ResponseHelper.java
index 8f686921..a79354d7 100644
--- a/src/main/java/io/seqera/tower/cli/utils/ResponseHelper.java
+++ b/src/main/java/io/seqera/tower/cli/utils/ResponseHelper.java
@@ -106,6 +106,7 @@ public static void errorMessage(PrintWriter err, Exception e) {
         }
 
         if (e instanceof ProcessingException) {
+            print(err, e.getMessage());
             print(err, "Connection error. Check the connection using the command 'tw info'.");
             return;
         }
diff --git a/src/main/java/io/seqera/tower/cli/utils/data/DataLinkProvider.java b/src/main/java/io/seqera/tower/cli/utils/data/DataLinkProvider.java
new file mode 100644
index 00000000..6d097ba9
--- /dev/null
+++ b/src/main/java/io/seqera/tower/cli/utils/data/DataLinkProvider.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.tower.cli.utils.data;
+
+public enum DataLinkProvider {
+    aws, google, azure
+}
diff --git a/src/test/java/io/seqera/tower/cli/data/DataLinksCmdTest.java b/src/test/java/io/seqera/tower/cli/data/DataLinksCmdTest.java
new file mode 100644
index 00000000..d94ab27c
--- /dev/null
+++ b/src/test/java/io/seqera/tower/cli/data/DataLinksCmdTest.java
@@ -0,0 +1,450 @@
+/*
+ * Copyright 2021-2023, Seqera.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package io.seqera.tower.cli.data;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import io.seqera.tower.cli.BaseCmdTest;
+import io.seqera.tower.cli.commands.data.links.ListCmd;
+import io.seqera.tower.cli.commands.enums.OutputType;
+import io.seqera.tower.cli.responses.data.DataLinkDeleted;
+import io.seqera.tower.cli.responses.data.DataLinksList;
+import io.seqera.tower.cli.utils.PaginationInfo;
+import io.seqera.tower.model.DataLinkDto;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.mockserver.client.MockServerClient;
+import org.mockserver.model.MediaType;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static io.seqera.tower.cli.utils.JsonHelper.parseJson;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockserver.matchers.Times.exactly;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+import static org.mockserver.model.JsonBody.json;
+
+public class DataLinksCmdTest extends BaseCmdTest {
+
+    @ParameterizedTest
+    @CsvSource(delimiter = ';', value = {
+            "bucket-name;aws;eu-west-1;s3://some-bucket/is/path;bucket-name provider:aws region:eu-west-1 resourceRef:s3://some-bucket/is/path",
+            ";aws,azure;eu-west-1;;provider:aws,azure region:eu-west-1",
+            ";google;;;provider:google",
+            ";;;;"
+    })
+    void testBuildingSearchParameter(String name, String providers, String region, String uri, String expected) {
+        String result = ListCmd.buildSearch(name, providers, region, uri);
+        assertEquals(result, expected);
+    }
+
+    @ParameterizedTest
+    @EnumSource(OutputType.class)
+    void testList(OutputType format, MockServerClient mock) throws JsonProcessingException {
+        // credentials fetch
+        mock.when(
+                request().withMethod("GET").withPath("/credentials").withQueryStringParameter("workspaceId", "75887156211589"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\"credentials\":[{\"id\":\"57Ic6reczFn78H1DTaaXkp\",\"name\":\"aws\",\"description\":null,\"discriminator\":\"aws\",\"baseUrl\":null,\"category\":null,\"deleted\":null,\"lastUsed\":\"2021-09-09T07:20:53Z\",\"dateCreated\":\"2021-09-08T05:48:51Z\",\"lastUpdated\":\"2021-09-08T05:48:51Z\"}]}").withContentType(MediaType.APPLICATION_JSON)
+        );
+        // status check
+        mock.when(
+                request()
+                        .withMethod("GET").withPath("/data-links")
+                        .withQueryStringParameter("workspaceId", "75887156211589")
+                        .withQueryStringParameter("offset", "0")
+                        .withQueryStringParameter("max", "1"),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody(loadResource("data/links/datalinks_list")).withContentType(MediaType.APPLICATION_JSON)
+        );
+        // mock fetch data links
+        mock.when(
+                request()
+                        .withMethod("GET").withPath("/data-links")
+                        .withQueryStringParameter("workspaceId", "75887156211589")
+                        .withQueryStringParameter("offset", "0")
+                        .withQueryStringParameter("max", "100"),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody(loadResource("data/links/datalinks_list")).withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        mock.when(
+                request().withMethod("GET").withPath("/user-info"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody(loadResource("user")).withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        mock.when(
+                request().withMethod("GET").withPath("/user/1264/workspaces"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody(loadResource("workspaces/workspaces_list")).withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        ExecOut out = exec(format, mock, "data-links", "list", "-w", "75887156211589");
+
+        // No errors thrown
+        assertEquals("", out.stdErr);
+        assertEquals(0, out.exitCode);
+
+        assertOutput(format, out, new DataLinksList("[organization1 / workspace1]",
+                Arrays.asList(
+                        parseJson("{\n" +
+                                "      \"id\": \"v1-cloud-c2875f38a7b5c8fe34a5b382b5f9e0c4\",\n" +
+                                "      \"name\": \"a-test-bucket-eend-us-east-1\",\n" +
+                                "      \"description\": null,\n" +
+                                "      \"resourceRef\": \"s3://a-test-bucket-eend-us-east-1\",\n" +
+                                "      \"type\": \"bucket\",\n" +
+                                "      \"provider\": \"aws\",\n" +
+                                "      \"region\": \"us-east-1\",\n" +
+                                "      \"credentials\": [\n" +
+                                "        {\n" +
+                                "          \"id\": \"57Ic6reczFn78H1DTaaXkp\",\n" +
+                                "          \"name\": \"aws\",\n" +
+                                "          \"provider\": \"aws\"\n" +
+                                "        }\n" +
+                                "      ],\n" +
+                                "      \"publicAccessible\": false,\n" +
+                                "      \"hidden\": false,\n" +
+                                "      \"status\": null,\n" +
+                                "      \"message\": null\n" +
+                                "    }", DataLinkDto.class),
+                        parseJson("{\n" +
+                                "      \"id\": \"v1-cloud-b89b60014c225c11f59048294354d174\",\n" +
+                                "      \"name\": \"adrian-navarro-test\",\n" +
+                                "      \"description\": null,\n" +
+                                "      \"resourceRef\": \"s3://adrian-navarro-test\",\n" +
+                                "      \"type\": \"bucket\",\n" +
+                                "      \"provider\": \"aws\",\n" +
+                                "      \"region\": \"us-east-1\",\n" +
+                                "      \"credentials\": [\n" +
+                                "        {\n" +
+                                "          \"id\": \"57Ic6reczFn78H1DTaaXkp\",\n" +
+                                "          \"name\": \"aws\",\n" +
+                                "          \"provider\": \"aws\"\n" +
+                                "        }\n" +
+                                "      ],\n" +
+                                "      \"publicAccessible\": false,\n" +
+                                "      \"hidden\": false,\n" +
+                                "      \"status\": null,\n" +
+                                "      \"message\": null\n" +
+                                "    }", DataLinkDto.class),
+                        parseJson("{\n" +
+                                "      \"id\": \"v1-cloud-422306eddadfc64de0676a5923517733\",\n" +
+                                "      \"name\": \"adrian-navarro-test-us-west-2\",\n" +
+                                "      \"description\": null,\n" +
+                                "      \"resourceRef\": \"s3://adrian-navarro-test-us-west-2\",\n" +
+                                "      \"type\": \"bucket\",\n" +
+                                "      \"provider\": \"aws\",\n" +
+                                "      \"region\": \"us-west-2\",\n" +
+                                "      \"credentials\": [\n" +
+                                "        {\n" +
+                                "          \"id\": \"57Ic6reczFn78H1DTaaXkp\",\n" +
+                                "          \"name\": \"aws\",\n" +
+                                "          \"provider\": \"aws\"\n" +
+                                "        }\n" +
+                                "      ],\n" +
+                                "      \"publicAccessible\": false,\n" +
+                                "      \"hidden\": false,\n" +
+                                "      \"status\": null,\n" +
+                                "      \"message\": null\n" +
+                                "    }", DataLinkDto.class)
+                ), false, PaginationInfo.from(0, 100)));
+    }
+
+    @ParameterizedTest
+    @EnumSource(OutputType.class)
+    void testFilteredList(OutputType format, MockServerClient mock) throws JsonProcessingException {
+        String json = "{\n" +
+                "      \"id\": \"v1-cloud-b89b60014c225c11f59048294354d174\",\n" +
+                "      \"name\": \"adrian-navarro-test\",\n" +
+                "      \"description\": null,\n" +
+                "      \"resourceRef\": \"s3://adrian-navarro-test\",\n" +
+                "      \"type\": \"bucket\",\n" +
+                "      \"provider\": \"aws\",\n" +
+                "      \"region\": \"us-east-1\",\n" +
+                "      \"credentials\": [\n" +
+                "        {\n" +
+                "          \"id\": \"57Ic6reczFn78H1DTaaXkp\",\n" +
+                "          \"name\": \"aws\",\n" +
+                "          \"provider\": \"aws\"\n" +
+                "        }\n" +
+                "      ],\n" +
+                "      \"publicAccessible\": false,\n" +
+                "      \"hidden\": false,\n" +
+                "      \"status\": null,\n" +
+                "      \"message\": null\n" +
+                "    }";
+
+        // credentials fetch
+        mock.when(
+                request().withMethod("GET").withPath("/credentials").withQueryStringParameter("workspaceId", "75887156211589"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\"credentials\":[{\"id\":\"57Ic6reczFn78H1DTaaXkp\",\"name\":\"aws\",\"description\":null,\"discriminator\":\"aws\",\"baseUrl\":null,\"category\":null,\"deleted\":null,\"lastUsed\":\"2021-09-09T07:20:53Z\",\"dateCreated\":\"2021-09-08T05:48:51Z\",\"lastUpdated\":\"2021-09-08T05:48:51Z\"}]}").withContentType(MediaType.APPLICATION_JSON)
+        );
+        // status check
+        mock.when(
+                request()
+                        .withMethod("GET").withPath("/data-links")
+                        .withQueryStringParameter("workspaceId", "75887156211589")
+                        .withQueryStringParameter("offset", "0")
+                        .withQueryStringParameter("max", "1"),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody(loadResource("data/links/datalinks_list")).withContentType(MediaType.APPLICATION_JSON)
+        );
+        // mock fetch data links
+        mock.when(
+                request()
+                        .withMethod("GET").withPath("/data-links")
+                        .withQueryStringParameter("workspaceId", "75887156211589")
+                        .withQueryStringParameter("search", "adrian provider:aws region:us-east-1")
+                        .withQueryStringParameter("offset", "0")
+                        .withQueryStringParameter("max", "100"),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\"dataLinks\": [" + json + "] }").withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        mock.when(
+                request().withMethod("GET").withPath("/user-info"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody(loadResource("user")).withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        mock.when(
+                request().withMethod("GET").withPath("/user/1264/workspaces"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody(loadResource("workspaces/workspaces_list")).withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        ExecOut out = exec(format, mock, "data-links", "list", "-w", "75887156211589", "-n", "adrian", "-p", "aws", "-r", "us-east-1");
+
+        // No errors thrown
+        assertEquals("", out.stdErr);
+        assertEquals(0, out.exitCode);
+
+        assertOutput(format, out,
+                new DataLinksList(
+                        "[organization1 / workspace1]",
+                        Collections.singletonList(parseJson(json, DataLinkDto.class)),
+                        false,
+                        PaginationInfo.from(0, 100)
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @EnumSource(OutputType.class)
+    void testAdd(OutputType format, MockServerClient mock) throws JsonProcessingException {
+        // credentials fetch
+        mock.when(
+                request().withMethod("GET").withPath("/credentials").withQueryStringParameter("workspaceId", "75887156211589"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\"credentials\":[{\"id\":\"57Ic6reczFn78H1DTaaXkp\",\"name\":\"aws\",\"description\":null,\"discriminator\":\"aws\",\"baseUrl\":null,\"category\":null,\"deleted\":null,\"lastUsed\":\"2021-09-09T07:20:53Z\",\"dateCreated\":\"2021-09-08T05:48:51Z\",\"lastUpdated\":\"2021-09-08T05:48:51Z\"}]}").withContentType(MediaType.APPLICATION_JSON)
+        );
+        // status check
+        mock.when(
+                request()
+                        .withMethod("POST").withPath("/data-links")
+                        .withQueryStringParameter("workspaceId", "75887156211589")
+                        .withBody(json("{\n" +
+                                "   \"name\":\"name\",\n" +
+                                "   \"description\":\"somedesc\",\n" +
+                                "   \"type\":\"bucket\",\n" +
+                                "   \"provider\":\"aws\",\n" +
+                                "   \"resourceRef\":\"s3://bucket\",\n" +
+                                "   \"publicAccessible\":false,\n" +
+                                "   \"credentialsId\":\"57Ic6reczFn78H1DTaaXkp\"\n" +
+                                "}")),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\n" +
+                        "    \"id\": \"v1-user-ad5192871d3d65e1218ec6c4a2f7cde5\",\n" +
+                        "    \"name\": \"name\",\n" +
+                        "    \"description\": \"somedesc\",\n" +
+                        "    \"resourceRef\": \"s3://bucket\",\n" +
+                        "    \"type\": \"bucket\",\n" +
+                        "    \"provider\": \"aws\",\n" +
+                        "    \"region\": \"us-east-1\",\n" +
+                        "    \"credentials\": [\n" +
+                        "        {\n" +
+                        "            \"id\": \"57Ic6reczFn78H1DTaaXkp\",\n" +
+                        "            \"name\": \"aws\",\n" +
+                        "            \"provider\": \"aws\"\n" +
+                        "        }\n" +
+                        "    ],\n" +
+                        "    \"publicAccessible\": false,\n" +
+                        "    \"hidden\": false,\n" +
+                        "    \"status\": null,\n" +
+                        "    \"message\": null\n" +
+                        "}").withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        ExecOut out = exec(format, mock, "data-links", "add", "-w", "75887156211589", "-n", "name", "-d", "somedesc", "-p", "aws",
+                "-u", "s3://bucket", "-c", "57Ic6reczFn78H1DTaaXkp");
+
+        // No errors thrown
+        assertEquals("", out.stdErr);
+        assertEquals(0, out.exitCode);
+    }
+
+    @ParameterizedTest
+    @EnumSource(OutputType.class)
+    void testDelete(OutputType format, MockServerClient mock) {
+        mock.when(
+                request().withMethod("DELETE").withPath("/data-links/v1-datalinkid")
+                        .withQueryStringParameter("workspaceId", "75887156211589"),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200)
+        );
+
+        ExecOut out = exec(format, mock, "data-links", "delete", "-w", "75887156211589", "-i", "v1-datalinkid");
+
+        assertOutput(format, out, new DataLinkDeleted("v1-datalinkid", 75887156211589L));
+    }
+
+    @ParameterizedTest
+    @EnumSource(OutputType.class)
+    void testUpdate(OutputType format, MockServerClient mock) {
+        // credentials fetch
+        mock.when(
+                request().withMethod("GET").withPath("/credentials").withQueryStringParameter("workspaceId", "75887156211589"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\"credentials\":[{\"id\":\"57Ic6reczFn78H1DTaaXkp\",\"name\":\"aws\",\"description\":null,\"discriminator\":\"aws\",\"baseUrl\":null,\"category\":null,\"deleted\":null,\"lastUsed\":\"2021-09-09T07:20:53Z\",\"dateCreated\":\"2021-09-08T05:48:51Z\",\"lastUpdated\":\"2021-09-08T05:48:51Z\"}]}").withContentType(MediaType.APPLICATION_JSON)
+        );
+        // status check
+        mock.when(
+                request()
+                        .withMethod("PUT").withPath("/data-links/v1-somedatalinkid")
+                        .withQueryStringParameter("workspaceId", "75887156211589")
+                        .withBody(json("{\n" +
+                                "   \"name\":\"name\",\n" +
+                                "   \"description\":\"somedesc\",\n" +
+                                "   \"credentialsId\":\"57Ic6reczFn78H1DTaaXkp\"\n" +
+                                "}")),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\n" +
+                        "    \"id\": \"v1-user-ad5192871d3d65e1218ec6c4a2f7cde5\",\n" +
+                        "    \"name\": \"name\",\n" +
+                        "    \"description\": \"somedesc\",\n" +
+                        "    \"resourceRef\": \"s3://bucket\",\n" +
+                        "    \"type\": \"bucket\",\n" +
+                        "    \"provider\": \"aws\",\n" +
+                        "    \"region\": \"us-east-1\",\n" +
+                        "    \"credentials\": [\n" +
+                        "        {\n" +
+                        "            \"id\": \"57Ic6reczFn78H1DTaaXkp\",\n" +
+                        "            \"name\": \"aws\",\n" +
+                        "            \"provider\": \"aws\"\n" +
+                        "        }\n" +
+                        "    ],\n" +
+                        "    \"publicAccessible\": false,\n" +
+                        "    \"hidden\": false,\n" +
+                        "    \"status\": null,\n" +
+                        "    \"message\": null\n" +
+                        "}").withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        ExecOut out = exec(format, mock, "data-links", "update", "-w", "75887156211589", "-i", "v1-somedatalinkid", "-n", "name", "-d", "somedesc", "-c", "57Ic6reczFn78H1DTaaXkp");
+
+        // No errors thrown
+        assertEquals("", out.stdErr);
+        assertEquals(0, out.exitCode);
+    }
+
+    @ParameterizedTest
+    @EnumSource(OutputType.class)
+    void testBrowse(OutputType format, MockServerClient mock) {
+        // credentials fetch
+        mock.when(
+                request().withMethod("GET").withPath("/credentials").withQueryStringParameter("workspaceId", "75887156211589"), exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\"credentials\":[{\"id\":\"57Ic6reczFn78H1DTaaXkp\",\"name\":\"aws\",\"description\":null,\"discriminator\":\"aws\",\"baseUrl\":null,\"category\":null,\"deleted\":null,\"lastUsed\":\"2021-09-09T07:20:53Z\",\"dateCreated\":\"2021-09-08T05:48:51Z\",\"lastUpdated\":\"2021-09-08T05:48:51Z\"}]}").withContentType(MediaType.APPLICATION_JSON)
+        );
+        mock.when(
+                request()
+                        .withMethod("GET").withPath("/data-links/v1-somedatalinkid")
+                        .withQueryStringParameter("workspaceId", "75887156211589")
+                        .withQueryStringParameter("credentialsId", "57Ic6reczFn78H1DTaaXkp"),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\n" +
+                        "    \"dataLink\": {\n" +
+                        "        \"id\": \"v1-cloud-9beb9b921331ce1427d23bd62ac4c4f7\",\n" +
+                        "        \"name\": \"adrian-navarro-test\",\n" +
+                        "        \"description\": null,\n" +
+                        "        \"resourceRef\": \"s3://adrian-navarro-test\",\n" +
+                        "        \"type\": \"bucket\",\n" +
+                        "        \"provider\": \"aws\",\n" +
+                        "        \"region\": \"us-east-1\",\n" +
+                        "        \"credentials\": [\n" +
+                        "            {\n" +
+                        "                \"id\": \"5EXFx2R5zWuwYtpKHhCZ0X\",\n" +
+                        "                \"name\": \"seqera_aws\",\n" +
+                        "                \"provider\": \"aws\"\n" +
+                        "            }\n" +
+                        "        ],\n" +
+                        "        \"publicAccessible\": false,\n" +
+                        "        \"hidden\": false,\n" +
+                        "        \"status\": null,\n" +
+                        "        \"message\": null\n" +
+                        "    }\n" +
+                        "}").withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        mock.when(
+                request()
+                        .withMethod("GET").withPath("/data-links/v1-somedatalinkid/browse/path")
+                        .withQueryStringParameter("workspaceId", "75887156211589")
+                        .withQueryStringParameter("credentialsId", "57Ic6reczFn78H1DTaaXkp")
+                        .withQueryStringParameter("search", "name")
+                        .withQueryStringParameter("nextPageToken", "sometoken")
+                        .withQueryStringParameter("pageSize", "1"),
+                exactly(1)
+        ).respond(
+                response().withStatusCode(200).withBody("{\n" +
+                        "    \"originalPath\": \"s3://adrian-navarro-test/lambda_tutorial_adrian\",\n" +
+                        "    \"objects\": [\n" +
+                        "        {\n" +
+                        "            \"type\": \"FILE\",\n" +
+                        "            \"name\": \"test4.csv\",\n" +
+                        "            \"size\": 1286,\n" +
+                        "            \"mimeType\": \"text/csv\"\n" +
+                        "        }\n" +
+                        "    ],\n" +
+                        "    \"nextPageToken\": null\n" +
+                        "}").withContentType(MediaType.APPLICATION_JSON)
+        );
+
+        ExecOut out = exec(format, mock, "data-links", "browse", "-w", "75887156211589", "-i", "v1-somedatalinkid", "-f", "name", "-p", "path",
+                "-c", "57Ic6reczFn78H1DTaaXkp", "-t", "sometoken", "--page", "1");
+
+        // No errors thrown
+        assertEquals("", out.stdErr);
+        assertEquals(0, out.exitCode);
+    }
+}
diff --git a/src/test/resources/runcmd/data/links/datalinks_list.json b/src/test/resources/runcmd/data/links/datalinks_list.json
new file mode 100644
index 00000000..9544d657
--- /dev/null
+++ b/src/test/resources/runcmd/data/links/datalinks_list.json
@@ -0,0 +1,64 @@
+{
+  "dataLinks": [
+    {
+      "id": "v1-cloud-c2875f38a7b5c8fe34a5b382b5f9e0c4",
+      "name": "a-test-bucket-eend-us-east-1",
+      "description": null,
+      "resourceRef": "s3://a-test-bucket-eend-us-east-1",
+      "type": "bucket",
+      "provider": "aws",
+      "region": "us-east-1",
+      "credentials": [
+        {
+          "id": "57Ic6reczFn78H1DTaaXkp",
+          "name": "aws",
+          "provider": "aws"
+        }
+      ],
+      "publicAccessible": false,
+      "hidden": false,
+      "status": null,
+      "message": null
+    },
+    {
+      "id": "v1-cloud-b89b60014c225c11f59048294354d174",
+      "name": "adrian-navarro-test",
+      "description": null,
+      "resourceRef": "s3://adrian-navarro-test",
+      "type": "bucket",
+      "provider": "aws",
+      "region": "us-east-1",
+      "credentials": [
+        {
+          "id": "57Ic6reczFn78H1DTaaXkp",
+          "name": "aws",
+          "provider": "aws"
+        }
+      ],
+      "publicAccessible": false,
+      "hidden": false,
+      "status": null,
+      "message": null
+    },
+    {
+      "id": "v1-cloud-422306eddadfc64de0676a5923517733",
+      "name": "adrian-navarro-test-us-west-2",
+      "description": null,
+      "resourceRef": "s3://adrian-navarro-test-us-west-2",
+      "type": "bucket",
+      "provider": "aws",
+      "region": "us-west-2",
+      "credentials": [
+        {
+          "id": "57Ic6reczFn78H1DTaaXkp",
+          "name": "aws",
+          "provider": "aws"
+        }
+      ],
+      "publicAccessible": false,
+      "hidden": false,
+      "status": null,
+      "message": null
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tw b/tw
index 9d3df862..cfceba26 100755
--- a/tw
+++ b/tw
@@ -7,7 +7,7 @@ if [ "$current_shell" = "bash" ]; then
     ./gradlew run -q --args="${*@Q}"
 elif [[ "$current_shell" = *"zsh"* ]]; then
     echo "Running in Zsh"
-    ./gradlew run -q --args="$@"
+    ./gradlew run -q --args="$*"
 else
     echo "Unknown shell: $current_shell"
     exit 1