diff --git a/.github/workflows/manual-deploy-obscuro-gateway.yml b/.github/workflows/manual-deploy-obscuro-gateway.yml
index 651ea96257..da98d6de1d 100644
--- a/.github/workflows/manual-deploy-obscuro-gateway.yml
+++ b/.github/workflows/manual-deploy-obscuro-gateway.yml
@@ -1,8 +1,8 @@
-# Deploys Obscuro Gateway on Azure for Testnet
+# Deploys Ten Gateway on Azure for Testnet
 # Builds the Obscuro Gateway image, pushes the image to dockerhub and starts the Obscuro Gateway on Azure VM
 
-name: '[M] Deploy Obscuro Gateway'
-run-name: '[M] Deploy Obscuro Gateway ( ${{ github.event.inputs.testnet_type }} )'
+name: '[M] Deploy Ten Gateway'
+run-name: '[M] Deploy Ten Gateway ( ${{ github.event.inputs.testnet_type }} )'
 on:
   workflow_dispatch:
     inputs:
@@ -96,7 +96,7 @@ jobs:
             --size 	Standard_DC1s_v2  --storage-sku StandardSSD_LRS --image ObscuroConfUbuntu \
             --authentication-type password
 
-      - name: 'Open Obscuro node-${{ matrix.host_id }} ports on Azure'
+      - name: 'Open Ten node-${{ matrix.host_id }} ports on Azure'
         uses: azure/CLI@v1
         with:
           inlineScript: |
@@ -107,38 +107,63 @@ jobs:
         shell: bash
         run: sleep 30
 
-      - name: 'Start Obscuro gateway on Azure'
+      - name: 'Start Ten gateway on Azure'
         uses: azure/CLI@v1
         with:
           inlineScript: |
             az vm run-command invoke -g Testnet -n "${{ github.event.inputs.testnet_type }}-OG-${{ GITHUB.RUN_NUMBER }}-SGX"  \
             --command-id RunShellScript \
-            --scripts 'mkdir -p /home/ten \
-            && sudo apt-get update \
-            && sudo apt-get install -y gcc \
-            && sudo snap refresh && sudo snap install --channel=1.18 go --classic \
-            && curl -fsSL https://get.docker.com -o get-docker.sh && sh ./get-docker.sh \
-            && docker pull ${{ vars.DOCKER_BUILD_TAG_GATEWAY }} \
-            && git clone --depth 1 -b ${{ env.BRANCH_NAME }} https://github.com/ten-protocol/go-ten.git /home/ten/go-ten \
-            && docker run -d --name datadog-agent \
-            && docker network create --driver bridge node_network || true \
-               --network node_network \
-               -e DD_API_KEY=${{ secrets.DD_API_KEY }} \
-               -e DD_LOGS_ENABLED=true \
-               -e DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL=true \
-               -e DD_LOGS_CONFIG_AUTO_MULTI_LINE_DETECTION=true \
-               -e DD_CONTAINER_EXCLUDE_LOGS="name:datadog-agent" \
-               -e DD_SITE="datadoghq.eu"  \
-               -v /var/run/docker.sock:/var/run/docker.sock:ro \
-               -v /proc/:/host/proc/:ro \
-               -v /opt/datadog-agent/run:/opt/datadog-agent/run:rw \
-               -v /sys/fs/cgroup/:/host/sys/fs/cgroup:ro \
-               datadog/agent:latest \
-            && cd /home/ten/go-ten/ \
-            && docker run -p 80:80 -p 81:81 --name ${{ github.event.inputs.testnet_type }}-OG-${{ GITHUB.RUN_NUMBER }}-SGX \
-                            -e OE_SIMULATION=0 \
-                            --entrypoint "/home/ten/go-ten/tools/walletextension/main/entry.sh" \
-                            ${{ vars.DOCKER_BUILD_TAG_GATEWAY }} \
-                            ego run /home/ten/go-ten/tools/walletextension/main/main \
-                            --host=0.0.0.0 --port=80 --portWS=81 --nodeHost=${{ vars.L2_RPC_URL_VALIDATOR }} --verbose=true \
-                            --logPath=sys_out --dbType=mariaDB --dbConnectionURL="obscurouser:${{ secrets.OBSCURO_GATEWAY_MARIADB_USER_PWD }}@tcp(obscurogateway-mariadb-${{ github.event.inputs.testnet_type }}.uksouth.cloudapp.azure.com:3306)/ogdb"
+            --scripts 'set -e
+            LOG_FILE=/home/ten/setup.log
+            exec > >(tee -i ${LOG_FILE}) 2>&1
+
+            echo "Creating directory /home/ten"
+            mkdir -p /home/ten
+
+            echo "Updating package list"
+            sudo apt-get update
+
+            echo "Installing gcc"
+            sudo apt-get install -y gcc
+
+            echo "Refreshing and installing snap packages"
+            sudo snap refresh && sudo snap install --channel=1.18 go --classic
+
+            echo "Installing Docker"
+            curl -fsSL https://get.docker.com -o get-docker.sh && sh ./get-docker.sh
+
+            echo "Pulling Docker image ${{ vars.DOCKER_BUILD_TAG_GATEWAY }}"
+            docker pull ${{ vars.DOCKER_BUILD_TAG_GATEWAY }}
+
+            echo "Cloning repository"
+            git clone --depth 1 -b ${{ env.BRANCH_NAME }} https://github.com/ten-protocol/go-ten.git /home/ten/go-ten
+
+            echo "Running Datadog agent container"
+            docker run -d --name datadog-agent \
+                --network node_network \
+                -e DD_API_KEY=${{ secrets.DD_API_KEY }} \
+                -e DD_LOGS_ENABLED=true \
+                -e DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL=true \
+                -e DD_LOGS_CONFIG_AUTO_MULTI_LINE_DETECTION=true \
+                -e DD_CONTAINER_EXCLUDE_LOGS="name:datadog-agent" \
+                -e DD_SITE="datadoghq.eu"  \
+                -v /var/run/docker.sock:/var/run/docker.sock:ro \
+                -v /proc/:/host/proc/:ro \
+                -v /opt/datadog-agent/run:/opt/datadog-agent/run:rw \
+                -v /sys/fs/cgroup/:/host/sys/fs/cgroup:ro \
+                datadog/agent:latest
+
+            echo "Creating Docker network if not exists"
+            docker network create --driver bridge node_network || true
+
+            echo "Starting Ten gateway container"
+            cd /home/ten/go-ten/
+            docker run -p 80:80 -p 81:81 --name ${{ github.event.inputs.testnet_type }}-OG-${{ GITHUB.RUN_NUMBER }}-SGX \
+                -e OE_SIMULATION=0 \
+                --entrypoint "/home/ten/go-ten/tools/walletextension/main/entry.sh" \
+                ${{ vars.DOCKER_BUILD_TAG_GATEWAY }} \
+                ego run /home/ten/go-ten/tools/walletextension/main/main \
+                --host=0.0.0.0 --port=80 --portWS=81 --nodeHost=${{ vars.L2_RPC_URL_VALIDATOR }} --verbose=true \
+                --logPath=sys_out --dbType=mariaDB --dbConnectionURL="obscurouser:${{ secrets.OBSCURO_GATEWAY_MARIADB_USER_PWD }}@tcp(obscurogateway-mariadb-${{ github.event.inputs.testnet_type }}.uksouth.cloudapp.azure.com:3306)/ogdb"
+
+            echo "Script execution completed"
\ No newline at end of file