diff --git a/.devcontainer.json b/.devcontainer.json
deleted file mode 100644
index a900611c..00000000
--- a/.devcontainer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "forwardPorts": [5173, 1317, 26657, 26656],
-  "portsAttributes": {
-      "5173": {
-        "label": "UI",
-        "onAutoForward": "openBrowser"
-      },
-      "1317": {
-        "label": "API",
-        "onAutoForward": "silent"
-      },
-      "26657": {
-          "label": "RPC",
-          "onAutoForward": "silent"
-      },
-      "26656": {
-        "label": "P2P",
-        "onAutoForward": "silent"
-      }
-  }
-  // "postStartCommand": "bash -i -c 'nvm install 18.20 && nvm alias default 18.20' && bash ./make_ports_public.sh 5173 1317 26657"
-}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6a8eaa08..18e4d42e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -27,23 +27,9 @@
 	},
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"postCreateCommand": "bash /workspaces/dapp-agoric-basics/make_ports_public.sh 26657 5173 1317",
-<<<<<<< HEAD
 	"postStartCommand": "yarn install",
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {},
 		"ghcr.io/devcontainers/features/github-cli:1": {}
 	}
-=======
-"postStartCommand": "/workspaces/dapp-agoric-basics/make_ports_public.sh 26656 5173 1317 26657 && yarn install",
-"features": {
-	"ghcr.io/devcontainers/features/docker-in-docker:2": {},
-	"ghcr.io/devcontainers/features/github-cli:1": {}
-}
-
-	// Configure tool-specific properties.
-	// "customizations": {},
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
->>>>>>> 593eec0 (fix: add gh CLI to features)
 }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..f33a02cd
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly
diff --git a/.setup/setup.sh b/.setup/setup.sh
deleted file mode 100755
index 96def143..00000000
--- a/.setup/setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-../make_ports_public.sh 5173 1317 26657
-
diff --git a/contract/scripts/run-chain.sh b/contract/scripts/run-chain.sh
index 689fc181..019cfa9f 100755
--- a/contract/scripts/run-chain.sh
+++ b/contract/scripts/run-chain.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+. /usr/src/upgrade-test-scripts/env_setup.sh
+
 # Start the chain in the background
 /usr/src/upgrade-test-scripts/start_agd.sh &
 
 # wait for blocks to start being produced
-waitForBlock 2
+waitForBlock 1
 
 make -C /workspace/contract mint100