diff --git a/output/docker-stacks-datascience-notebook/trino-wrapper.sh b/output/docker-stacks-datascience-notebook/trino-wrapper.sh
index d06f41f98..f5485f7af 100755
--- a/output/docker-stacks-datascience-notebook/trino-wrapper.sh
+++ b/output/docker-stacks-datascience-notebook/trino-wrapper.sh
@@ -4,18 +4,22 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/jupyterlab-cpu/trino-wrapper.sh b/output/jupyterlab-cpu/trino-wrapper.sh
index d06f41f98..f5485f7af 100755
--- a/output/jupyterlab-cpu/trino-wrapper.sh
+++ b/output/jupyterlab-cpu/trino-wrapper.sh
@@ -4,18 +4,22 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/jupyterlab-pytorch/trino-wrapper.sh b/output/jupyterlab-pytorch/trino-wrapper.sh
index d06f41f98..f5485f7af 100755
--- a/output/jupyterlab-pytorch/trino-wrapper.sh
+++ b/output/jupyterlab-pytorch/trino-wrapper.sh
@@ -4,18 +4,22 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/jupyterlab-tensorflow/trino-wrapper.sh b/output/jupyterlab-tensorflow/trino-wrapper.sh
index d06f41f98..f5485f7af 100755
--- a/output/jupyterlab-tensorflow/trino-wrapper.sh
+++ b/output/jupyterlab-tensorflow/trino-wrapper.sh
@@ -4,18 +4,22 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/remote-desktop/trino-wrapper.sh b/output/remote-desktop/trino-wrapper.sh
index d06f41f98..f5485f7af 100755
--- a/output/remote-desktop/trino-wrapper.sh
+++ b/output/remote-desktop/trino-wrapper.sh
@@ -4,18 +4,22 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/rstudio/trino-wrapper.sh b/output/rstudio/trino-wrapper.sh
index d06f41f98..f5485f7af 100755
--- a/output/rstudio/trino-wrapper.sh
+++ b/output/rstudio/trino-wrapper.sh
@@ -4,18 +4,22 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/sas/trino-wrapper.sh b/output/sas/trino-wrapper.sh
index d06f41f98..f5485f7af 100755
--- a/output/sas/trino-wrapper.sh
+++ b/output/sas/trino-wrapper.sh
@@ -4,18 +4,22 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/resources/common/trino-wrapper.sh b/resources/common/trino-wrapper.sh
index d06f41f98..f5485f7af 100755
--- a/resources/common/trino-wrapper.sh
+++ b/resources/common/trino-wrapper.sh
@@ -4,18 +4,22 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+