diff --git a/.devcontainer/scripts/onCreateCommand.sh b/.devcontainer/scripts/onCreateCommand.sh
index 0208ef556408..392909262fa8 100755
--- a/.devcontainer/scripts/onCreateCommand.sh
+++ b/.devcontainer/scripts/onCreateCommand.sh
@@ -3,13 +3,11 @@
 TYPE=$1
 NAME=$2
 
-apt install gh
-
 curl -s install.aztec.network | NON_INTERACTIVE=1 BIN_PATH=/usr/local/bin bash -s
 docker compose -f $HOME/.aztec/docker-compose.yml pull
 
 if ! grep -q "PXE_URL" ~/.bashrc; then
-    echo "export PXE_URL=https://\$CODESPACE_NAME-8080.preview.\$GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN" >> ~/.bashrc
+    echo "export PXE_URL=https://\$CODESPACE_NAME-8080.\$GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN" >> ~/.bashrc
 fi
 
 yes | npx create-aztec-app -t $TYPE -n $NAME -s
diff --git a/.devcontainer/scripts/postAttachCommand.sh b/.devcontainer/scripts/postAttachCommand.sh
index e2ccda17ac51..07f72978c5f2 100755
--- a/.devcontainer/scripts/postAttachCommand.sh
+++ b/.devcontainer/scripts/postAttachCommand.sh
@@ -2,7 +2,9 @@
 TYPE=$1
 NAME=$2
 
-gh codespace ports visibility 8080:public -c $CODESPACE_NAME
+apt install gh
+
+echo "gh codespace ports visibility 8080:public -c $CODESPACE_NAME" >> ~/.bashrc
 
 (nohup /usr/local/bin/aztec sandbox &)
 
diff --git a/.devcontainer/token/devcontainer.json b/.devcontainer/token/devcontainer.json
index ebb1cef6f527..0cee7d519ee7 100644
--- a/.devcontainer/token/devcontainer.json
+++ b/.devcontainer/token/devcontainer.json
@@ -25,6 +25,5 @@
       "target": "/root/workspace/.devcontainer/scripts",
       "type": "bind"
     }
-  ],
-  "forwardPorts": [8080]
+  ]
 }