diff --git a/.azure-devops/azure-pipelines.yml b/.azure-devops/azure-pipelines.yml
index 83982b3ff..fdb64f34f 100644
--- a/.azure-devops/azure-pipelines.yml
+++ b/.azure-devops/azure-pipelines.yml
@@ -145,38 +145,39 @@ jobs:
       inputs:
         subFolder: github-tests/Dockerfile/build-only
 
-  - job: test_platform_with_runcmd
-    displayName: Test with platform and runCmd
-    steps:
-    - script: |
-        docker login -u $ACR_USERNAME -p $ACR_TOKEN $(ACR_NAME).azurecr.io
-      displayName: 'Log in to Azure Container Registry'
-      env:
-        ACR_NAME: $(ACR_NAME)
-        ACR_TOKEN: $(ACR_TOKEN)
-        ACR_USERNAME: $(ACR_USERNAME)
-
-    - script: |
-        printenv | sort
-      env:
-        IMAGE_TAG: $(IMAGE_TAG)
-
-    - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      displayName: Set up QEMU
-
-    - script: docker buildx create --use
-      displayName: Set up docker buildx
-
-    - task: DevcontainersCi@0
-      inputs:
-        imageName: '$(ACR_NAME).azurecr.io/devcontainers-ci/azdo-devcontainer-build-run/test/platform-with-runcmd'
-        subFolder: github-tests/Dockerfile/platform-with-runcmd
-        platform: linux/amd64,linux/arm64
-        runCmd: echo $HOSTNAME && [[ $HOSTNAME == "my-host" ]]
-
-    - script: |
-        echo "'runCmdOutput' value: $runCmdOutput"
-        if [["$runCmdOutput" = *my-host*]]; then
-          echo "'runCmdOutput' output of test_simple job doesn't contain expected value 'my-host'"
-          exit 1
-        fi
\ No newline at end of file
+  # Temporarily commented out: https://github.com/devcontainers/ci/issues/198
+  # - job: test_platform_with_runcmd
+  #   displayName: Test with platform and runCmd
+  #   steps:
+  #   - script: |
+  #       docker login -u $ACR_USERNAME -p $ACR_TOKEN $(ACR_NAME).azurecr.io
+  #     displayName: 'Log in to Azure Container Registry'
+  #     env:
+  #       ACR_NAME: $(ACR_NAME)
+  #       ACR_TOKEN: $(ACR_TOKEN)
+  #       ACR_USERNAME: $(ACR_USERNAME)
+
+  #   - script: |
+  #       printenv | sort
+  #     env:
+  #       IMAGE_TAG: $(IMAGE_TAG)
+
+  #   - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+  #     displayName: Set up QEMU
+
+  #   - script: docker buildx create --use
+  #     displayName: Set up docker buildx
+
+  #   - task: DevcontainersCi@0
+  #     inputs:
+  #       imageName: '$(ACR_NAME).azurecr.io/devcontainers-ci/azdo-devcontainer-build-run/test/platform-with-runcmd'
+  #       subFolder: github-tests/Dockerfile/platform-with-runcmd
+  #       platform: linux/amd64,linux/arm64
+  #       runCmd: echo $HOSTNAME && [[ $HOSTNAME == "my-host" ]]
+
+  #   - script: |
+  #       echo "'runCmdOutput' value: $runCmdOutput"
+  #       if [["$runCmdOutput" = *my-host*]]; then
+  #         echo "'runCmdOutput' output of test_simple job doesn't contain expected value 'my-host'"
+  #         exit 1
+  #       fi
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 25b33a462..e629bb760 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -32,6 +32,6 @@
 		}
 	},
 	"features": {
-		"github-cli": "latest"
+		"ghcr.io/devcontainers/features/github-cli:1": "latest"
 	}
 }
\ No newline at end of file
diff --git a/.github/workflows/ci_branch.yml b/.github/workflows/ci_branch.yml
index d1e9311c7..a9f985f77 100644
--- a/.github/workflows/ci_branch.yml
+++ b/.github/workflows/ci_branch.yml
@@ -27,4 +27,3 @@ jobs:
       runFullTests: ${{ github.event.inputs.runFullTests == 'true' }}
     secrets:
       AZDO_TOKEN: ${{ secrets.AZDO_TOKEN }}
-      MARKETPLACE_TOKEN: ${{ secrets.MARKETPLACE_TOKEN }}
diff --git a/.github/workflows/ci_common.yml b/.github/workflows/ci_common.yml
index 0c45bfd6a..635470731 100644
--- a/.github/workflows/ci_common.yml
+++ b/.github/workflows/ci_common.yml
@@ -49,9 +49,6 @@ on:
       AZDO_TOKEN:
         description: ""
         required: true
-      MARKETPLACE_TOKEN:
-        description: ""
-        required: true
 
 jobs:
 
@@ -311,7 +308,6 @@ jobs:
           AZDO_ORG: ${{ inputs.AZDO_ORG }}
           AZDO_TOKEN: ${{ secrets.AZDO_TOKEN }}
           AZURE_DEVOPS_EXT_PAT: ${{ secrets.AZDO_TOKEN }}
-          MARKETPLACE_TOKEN: ${{ secrets.MARKETPLACE_TOKEN }}
           BUILD_NUMBER: ${{ github.run_id }}
           IS_PR: ${{ github.head_ref }}
           BRANCH: ${{ github.ref }}
@@ -330,7 +326,6 @@ jobs:
             AZDO_ORG
             AZDO_PROJECT
             AZDO_BUILD
-            MARKETPLACE_TOKEN
 
   #
   # Jobs to test
@@ -391,7 +386,6 @@ jobs:
           AZDO_ORG: ${{ inputs.AZDO_ORG }}
           AZDO_TOKEN: ${{ secrets.AZDO_TOKEN }}
           AZURE_DEVOPS_EXT_PAT: ${{ secrets.AZDO_TOKEN }}
-          MARKETPLACE_TOKEN: ${{ secrets.MARKETPLACE_TOKEN }}
           BUILD_NUMBER: ${{ github.run_id }}
           IS_PR: ${{ github.head_ref }}
           BRANCH: ${{ github.ref }}
@@ -412,7 +406,6 @@ jobs:
             AZDO_ORG
             AZDO_PROJECT
             AZDO_BUILD
-            MARKETPLACE_TOKEN
 
 
   test-simple:
diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml
index c0a4cef3e..6a4abcef7 100644
--- a/.github/workflows/ci_main.yml
+++ b/.github/workflows/ci_main.yml
@@ -16,4 +16,3 @@ jobs:
       release: true
     secrets:
       AZDO_TOKEN: ${{ secrets.AZDO_TOKEN }}
-      MARKETPLACE_TOKEN: ${{ secrets.MARKETPLACE_TOKEN }}
diff --git a/.github/workflows/pr-bot.yml b/.github/workflows/pr-bot.yml
index b38a9259e..2a6a4afbf 100644
--- a/.github/workflows/pr-bot.yml
+++ b/.github/workflows/pr-bot.yml
@@ -77,4 +77,3 @@ jobs:
       release: false
     secrets:
       AZDO_TOKEN: ${{ secrets.AZDO_TOKEN }}
-      MARKETPLACE_TOKEN: ${{ secrets.MARKETPLACE_TOKEN }}
diff --git a/.github/workflows/pr_auto.yml b/.github/workflows/pr_auto.yml
index ef3af0d5b..452316268 100644
--- a/.github/workflows/pr_auto.yml
+++ b/.github/workflows/pr_auto.yml
@@ -20,4 +20,3 @@ jobs:
       runFullTests: false
     secrets:
       AZDO_TOKEN: ${{ secrets.AZDO_TOKEN }}
-      MARKETPLACE_TOKEN: ${{ secrets.MARKETPLACE_TOKEN }}
diff --git a/github-tests/Dockerfile/feature-docker-from-docker/.devcontainer/devcontainer.json b/github-tests/Dockerfile/feature-docker-from-docker/.devcontainer/devcontainer.json
index 984b60770..074d2290b 100644
--- a/github-tests/Dockerfile/feature-docker-from-docker/.devcontainer/devcontainer.json
+++ b/github-tests/Dockerfile/feature-docker-from-docker/.devcontainer/devcontainer.json
@@ -8,7 +8,7 @@
 			// Update the VARIANT arg to pick a version of Go: 1, 1.18, 1.17
 			// Append -bullseye or -buster to pin to an OS version.
 			// Use -bullseye variants on local arm64/Apple Silicon.
-			"VARIANT": "1.17-bullseye",
+			"VARIANT": "1.18-bullseye",
 			// Options
 			"NODE_VERSION": "none"
 		},
@@ -37,6 +37,6 @@
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
 	"features": {
-		"docker-from-docker": "20.10"
+		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {"version": "20.10"}
 	}
 }
diff --git a/github-tests/docker-compose/features/.devcontainer/devcontainer.json b/github-tests/docker-compose/features/.devcontainer/devcontainer.json
index ce7c92366..dc6b03ae1 100644
--- a/github-tests/docker-compose/features/.devcontainer/devcontainer.json
+++ b/github-tests/docker-compose/features/.devcontainer/devcontainer.json
@@ -25,6 +25,6 @@
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "node",
 	"features": {
-		"golang": "1.18"
+		"ghcr.io/devcontainers/features/go:1": {"version":"1.18"}
 	}
 }
diff --git a/scripts/publish-azdo-task.sh b/scripts/publish-azdo-task.sh
index 7e1f70d92..0f7ece200 100755
--- a/scripts/publish-azdo-task.sh
+++ b/scripts/publish-azdo-task.sh
@@ -3,8 +3,8 @@ set -e
 
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-if [[ -z "$MARKETPLACE_TOKEN" ]]; then
-	echo "MARKETPLACE_TOKEN must be specified"
+if [[ -z "$AZDO_TOKEN" ]]; then
+	echo "AZDO_TOKEN must be specified"
 	exit 1
 fi
 
@@ -12,4 +12,4 @@ cd "$script_dir/.."
 echo "Publishing extension..."
 vsix_file=$(ls output/devcontainers.*.vsix)
 echo "Using VSIX_FILE=$vsix_file"
-tfx extension publish  --token $MARKETPLACE_TOKEN --vsix $vsix_file  --override "{\"public\": true}"
+tfx extension publish  --token $AZDO_TOKEN --vsix $vsix_file  --override "{\"public\": true}"
diff --git a/scripts/test-azdo.sh b/scripts/test-azdo.sh
index a5fe84821..4f0045304 100755
--- a/scripts/test-azdo.sh
+++ b/scripts/test-azdo.sh
@@ -7,10 +7,6 @@ if [[ -z "$AZDO_TOKEN" ]]; then
 	echo "AZDO_TOKEN must be specified"
 	exit 1
 fi
-if [[ -z "$MARKETPLACE_TOKEN" ]]; then
-	echo "MARKETPLACE_TOKEN must be specified"
-	exit 1
-fi
 
 cd "$script_dir/.."
 vsix_file=$(ls output/devcontainers-dev.*.vsix)
@@ -18,7 +14,7 @@ echo "Using VSIX_FILE=$vsix_file"
 
 # Publish as non-public and as devcontainers-dev
 echo "Publishing private extension version..."
-tfx extension publish  --token "$MARKETPLACE_TOKEN" --vsix "$vsix_file" --override "{\"public\": false, \"publisher\": \"devcontainers-dev\"}" --share-with devcontainers-ci,stuartle
+tfx extension publish  --token "$AZDO_TOKEN" --vsix "$vsix_file" --override "{\"public\": false, \"publisher\": \"devcontainers-dev\"}" --share-with monacotools
 
 echo "Installing private extension"
 tfx extension install  --token "$AZDO_TOKEN" --vsix "$vsix_file" --service-url "$AZDO_ORG"