diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index ab937a5e6..0afafe486 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -U virtualenv setuptools wheel git+https://github.com/tox-dev/tox.git@3.28.0
+          pip install -U virtualenv setuptools wheel tox
           sudo apt update
           sudo apt-get install graphviz pandoc qt5-default
       - name: Build and publish
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd216ba26..1646f37a7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,7 +36,7 @@ jobs:
             ubuntu-20.04-${{ matrix.python-version }}
       - name: Install Deps
         run: |
-          python -m pip install -U git+https://github.com/tox-dev/tox.git@3.28.0 setuptools virtualenv wheel
+          python -m pip install -U tox setuptools virtualenv wheel
           sudo apt install libglu1-mesa libglu1-mesa-dev
       - name: Install and Run Tests
         run: tox -e py
@@ -66,7 +66,7 @@ jobs:
             macOS-latest-${{ matrix.python-version }}-pip-
             macOS-latest-${{ matrix.python-version }}
       - name: Install Deps
-        run: python -m pip install -U git+https://github.com/tox-dev/tox.git@3.28.0 setuptools virtualenv wheel
+        run: python -m pip install -U tox setuptools virtualenv wheel 
       - name: Install and Run Tests
         run: tox -e py
   #  windows-tests:
@@ -92,7 +92,7 @@ jobs:
   #            ${{ runner.os }}-${{ matrix.python-version }}-
   #      - name: Install deps
   #        run: |
-  #          python -m pip install -U git+https://github.com/tox-dev/tox.git@3.28.0 cvxopt setuptools virtualenv wheel
+  #          python -m pip install -U tox cvxopt setuptools virtualenv wheel
   #        shell: pwsh
   #      - name: Install and Run Tests
   #        run: tox --sitepackages -e py
@@ -116,7 +116,7 @@ jobs:
             ${{ runner.os }}-${{ matrix.python-version }}-pip-
             ${{ runner.os }}-${{ matrix.python-version }}-
       - name: Install Deps
-        run: python -m pip install -U git+https://github.com/tox-dev/tox.git@3.28.0
+        run: python -m pip install -U tox
       - name: Run lint
         run: tox -elint
   docs:
@@ -141,7 +141,7 @@ jobs:
             ${{ runner.os }}-
       - name: Install Deps
         run: |
-          python -m pip install -U git+https://github.com/tox-dev/tox.git@3.28.0
+          python -m pip install -U tox
           sudo apt update
           sudo apt install -y graphviz pandoc qt5-default
       - name: Build Docs
@@ -172,7 +172,7 @@ jobs:
 #        run: |
 #          set -e
 #          python -m pip install --upgrade pip
-#          python -m pip install -U git+https://github.com/tox-dev/tox.git@3.28.0
+#          python -m pip install -U tox
 #          sudo apt install -y graphviz pandoc qt5-default
 #          pip check
 #        shell: bash
diff --git a/tox.ini b/tox.ini
index e258456eb..155e10715 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 minversion = 2.1
 envlist = py39, lint, docs
-skipsdist = True
 
 [testenv]
 usedevelop = true
@@ -17,6 +16,7 @@ commands =
 
 [testenv:lint]
 basepython = python3.9
+skip_install = true
 deps =
   pylint
   ipython
@@ -27,16 +27,21 @@ commands =
 
 [testenv:docs]
 basepython = python3.9
+# This is not optimal, will require more organization of Metal project.
+# Or, sloppy.... put all the packages from requirement.txt into requirement-dev.txt.
+skip_install = false
 envdir = .tox/docs
-passenv = DOCS_FROM_MASTER QISKIT_DOCS_BUILD_TUTORIALS
+passenv = DOCS_FROM_MASTER, QISKIT_DOCS_BUILD_TUTORIALS
 deps =
   -r requirements-dev.txt
+allowlist_externals=touch
 commands =
   touch {toxinidir}/docs/.buildingdocs
   sphinx-build -b html {posargs} {toxinidir}/docs/ {toxinidir}/docs/_build/html
 
 [testenv:gettext]
 basepython = python3.9
+skip_install = true
 envdir = .tox/docs
 deps =
   -r requirements-dev.txt