diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml
index 318dd5b8da15..537013baea63 100644
--- a/.github/actions/build-vsix/action.yml
+++ b/.github/actions/build-vsix/action.yml
@@ -9,36 +9,49 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    # For faster/better builds of sdists.
-    - run: python -m pip install wheel
+    - name: Upgrade Pip
+      run: python -m pip install -U pip
       shell: bash
 
-    - run: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
+    # For faster/better builds of sdists.
+    - name: Install build pre-requisite
+      run: python -m pip install wheel
       shell: bash
 
-    - run: |
-        python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --platform any --abi none --no-deps --only-binary :all: --upgrade -r jedils_requirements.txt
+    - name: Install python dependencies
+      run: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
       shell: bash
 
-    - run: |
+    - name: Install debugpy
+      run: |
         python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
         python ./pythonFiles/install_debugpy.py
       shell: bash
 
-    - run: npm ci --prefer-offline
+    - name: Install Jedi LSP
+      run: |
+        python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --platform any --abi none --no-deps --only-binary :all: --upgrade -r jedils_requirements.txt
+      shell: bash
+
+    - name: Run npm ci
+      run: npm ci --prefer-offline
       shell: bash
 
     # Use the GITHUB_RUN_ID environment variable to update the build number.
     # GITHUB_RUN_ID is a unique number for each run within a repository.
     # This number does not change if you re-run the workflow run.
-    - run: npm run updateBuildNumber -- --buildNumber $GITHUB_RUN_ID
+    - name: Update extension build number
+      run: npm run updateBuildNumber -- --buildNumber $GITHUB_RUN_ID
       shell: bash
 
-    - run: npm run addExtensionDependencies
+    - name: Update extension dependencies
+      run: npm run addExtensionDependencies
       shell: bash
 
-    - run: npm run addExtensionPackDependencies
+    - name: Update Optional extension dependencies
+      run: npm run addExtensionPackDependencies
       shell: bash
 
-    - run: npm run package
+    - name: Build VSIX
+      run: npm run package
       shell: bash
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c8cdd91f8db..7a301c6ee180 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,13 +55,11 @@ jobs:
         with:
           node-version: ${{env.NODE_VERSION}}
 
-      - name: Use Python 3.x
+      # Jedi LS depends on dataclasses which was a pypi install in 3.6
+      - name: Use Python 3.6 for JediLSP
         uses: actions/setup-python@v2
         with:
-          python-version: 3.x
-
-      - name: Upgrade pip
-        run: python -m pip install -U pip
+        python-version: 3.6
 
       - name: Build VSIX
         uses: ./.github/actions/build-vsix
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 5ff156bf2134..ad54e3152b40 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -32,13 +32,11 @@ jobs:
         with:
           node-version: ${{env.NODE_VERSION}}
 
-      - name: Use Python ${{env.PYTHON_VERSION}}
+      # Jedi LS depends on dataclasses which was a pypi install in 3.6
+      - name: Use Python 3.6 for JediLSP
         uses: actions/setup-python@v2
         with:
-          python-version: ${{env.PYTHON_VERSION}}
-
-      - name: Upgrade pip
-        run: python -m pip install -U pip
+          python-version: 3.6
 
       - name: Build VSIX
         uses: ./.github/actions/build-vsix
diff --git a/news/2 Fixes/16119.md b/news/2 Fixes/16119.md
new file mode 100644
index 000000000000..a9876f43b29b
--- /dev/null
+++ b/news/2 Fixes/16119.md	
@@ -0,0 +1 @@
+Ensure that `dataclasses` is installed when using Jedi LSP.