diff --git a/.github/workflows/publish-to-openvsx.yml b/.github/workflows/publish-to-openvsx.yml
new file mode 100644
index 000000000..272af0cb6
--- /dev/null
+++ b/.github/workflows/publish-to-openvsx.yml
@@ -0,0 +1,57 @@
+name: Publish to Open VSX Marketplace
+
+on:
+    workflow_dispatch:
+        inputs:
+            version:
+                description: "Release tag"
+                required: true
+                type: string
+
+    release:
+        types: [published]
+
+jobs:
+    publish-to-openvsx:
+        runs-on: ubuntu-latest
+        environment: Production
+
+        steps:
+            - name: Use Node.js 18.x
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 18.x
+
+            - name: Download release
+              run: |
+                  set x
+                  echo Version: ${{ github.event.inputs.version }}
+                  echo REF: ${{ github.ref }}
+                  TAG=${{ github.event.inputs.version }}
+                  if [[ ! -z "${{ github.event.inputs.version }}" ]]; then
+                    TAG=${{ github.event.inputs.version }}
+                  elif [[ "${{ github.ref }}" == refs/tags/* ]]; then
+                    TAG=$(echo ${{ github.ref }} | sed -e "s|^refs/tags/||")
+                  else
+                    exit 1
+                  fi
+                  echo Tag: $TAG
+                  gh release download $TAG -R databricks/databricks-vscode
+                  ls -lR
+                  echo "TAG=$TAG" >> $GITHUB_ENV
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Install vcse
+              run: npm install -g @vscode/vsce
+
+            - name: Install ovsx
+              run: npm install -g ovsx
+
+            - name: Publish to Open VSX
+              run: |
+                  ovsx verify-pat databricks
+                  ovsx publish --packagePath databricks-*.vsix
+
+              env:
+                  OVSX_PAT: ${{ secrets.OVSX_PAT }}
diff --git a/.github/workflows/publish-to-vscode.yml b/.github/workflows/publish-to-vscode.yml
index e50e4eba3..59c71187c 100644
--- a/.github/workflows/publish-to-vscode.yml
+++ b/.github/workflows/publish-to-vscode.yml
@@ -52,14 +52,3 @@ jobs:
 
               env:
                   VSCE_TOKEN: ${{ secrets.VSCE_TOKEN }}
-
-            # - name: Install ovsx
-            #   run: npm install -g ovsx
-
-            # - name: Publish to Open VSIX
-            #   run: |
-            #     ovsx verify-pat databricks
-            #     ovsx publish --packagePath databricks-*.vsix
-
-            #   env:
-            #     OVSX_PAT: ${{ secrets.OVSX_PAT }}