diff --git a/.circleci/config.yml b/.circleci/config.yml
index fcd8e3896..cbe2f9085 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,9 +37,6 @@ jobs:
           command: |
             . ~/venv/bin/activate
             pip list || true
-      - run:
-          name: Clear dist folder
-          command: rm -rf dist && mkdir dist
       - run:
           name: Linting
           command: |
@@ -55,14 +52,14 @@ jobs:
           name: API Doc generation
           command: |
             . ~/venv/bin/activate
-            make mkdocs
+            make documentation
       - run:
           name: Build wheel
           command: |
             . ~/venv/bin/activate
             make build
       - store_artifacts:
-          path: dist
+          path: dist_python
           destination: dist-python
       - persist_to_workspace:
           root: ~/.
@@ -90,7 +87,7 @@ jobs:
           name: Publish package
           command: |
             . ~/venv/bin/activate
-            twine upload dist/*
+            twine upload dist_python/*
   web-build:
     executor: node-executor
     steps:
diff --git a/.gitignore b/.gitignore
index ac149f8c8..680989c0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /build/
 /storybook-static/
 /dist/tsBuildInfoFile
+/dist_python/
 /lib/
 *.egg-info/
 *.egg
diff --git a/Makefile b/Makefile
index c9ce5e500..efcccabd7 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ lint:
 test:
 	pytest $(pkg_src)
 
-.PHONEY: mkdocs ## Shortcut for mkdocs command
-mkdocs: 
+.PHONEY: documentation ## Generate docs
+documentation: 
 	mkdocs build
 
 .PHONY: install  ## Install the requirements
@@ -43,12 +43,12 @@ develop:
 
 .PHONY: build  ## Build a wheel
 build:
-	python setup.py sdist bdist_wheel
+	python setup.py sdist bdist_wheel --dist-dir dist_python
 
 .PHONY: publish  ## Publish the ./dist/* using twine
 publish:
 	pip install twine==3.8.0
-	twine upload --repository-url https://upload.pypi.org/legacy/ dist/*
+	twine upload --repository-url https://upload.pypi.org/legacy/ dist_python/*
 
 .PHONY: help  ## Display this message
 help:
diff --git a/docs/development/index.md b/docs/development/index.md
index d4158fe2a..49a6510ce 100644
--- a/docs/development/index.md
+++ b/docs/development/index.md
@@ -20,10 +20,10 @@ Use `make test` to run the available test-suites using pytest.
 
 ### Commands
 
-* `make mkdocs new [dir-name]` - Create a new project.
-* `make mkdocs serve` - Start the live-reloading docs server.
-* `make mkdocs build` - Build the documentation site.
-* `make mkdocs -h` - Print help message and exit.
+* `mkdocs new [dir-name]` - Create a new project.
+* `mkdocs serve` - Start the live-reloading docs server.
+* `mkdocs build` - Build the documentation site.
+* `mkdocs -h` - Print help message and exit.
 
 ### Project layout
 
diff --git a/setup.cfg b/setup.cfg
index 8eb1dee27..ba0e9b5cc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,3 @@
-[bdist_wheel]
-# This flag says that the code is written to work on both Python 2 and Python
-# 3. If at all possible, it is good practice to do this. If you cannot, you
-# will need to generate wheels for each Python version that you support.
-universal=1
-
-[aliases]
-test=pytest
-
 [flake8]
 max-line-length=140
 extend-ignore=E203,E111,E114,E501,E121,E123,E126,E226,E24,E704
diff --git a/setup.py b/setup.py
index fd106e22d..eae4018a9 100644
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,8 @@ def requirements(file):
     'Programming Language :: Python :: 3.10'
   ],
 
+  python_requires='>=3',
+
   # You can just specify the packages manually here if your project is
   # simple. Or you can use find_packages().
   packages=find_packages(exclude=['docs', 'tests*']),