diff --git a/.github/workflows/publish-wavelite.yml b/.github/workflows/publish-wavelite.yml
new file mode 100644
index 0000000000..6dfd41cd60
--- /dev/null
+++ b/.github/workflows/publish-wavelite.yml
@@ -0,0 +1,36 @@
+name: Publish Wavelite
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release Version'
+        required: true
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  VERSION: "${{ github.event.inputs.version }}"
+
+jobs:
+  publish:
+    name: Publish Wavelite
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GIT_TOKEN }}
+
+      - name: Build wavelite
+        run:  make publish-wavelite
+      
+      - name: Publish to PyPI - wavelite
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          packages_dir: py/h2o_wavelite/dist
+          password: ${{ secrets.PYPI_WAVELITE_TOKEN }}
+
+      - name: Publish to PyPI - wavelite_web
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          packages_dir: py/h2o_wavelite_web/dist
+          password: ${{ secrets.PYPI_WAVELITE_WEB_TOKEN }}
diff --git a/.github/workflows/release-wave.yml b/.github/workflows/release-wave.yml
index 30adcbb184..8cced64737 100644
--- a/.github/workflows/release-wave.yml
+++ b/.github/workflows/release-wave.yml
@@ -151,8 +151,20 @@ jobs:
       - name: Build university
         run:  make publish-university
       
-      - name: Publish Wave University to PyPI
+      - name: Publish to PyPI - wave_university
         uses: pypa/gh-action-pypi-publish@master
         with:
           packages_dir: university/dist
           password: ${{ secrets.PYPI_UNIVERSITY_TOKEN }}
+
+      - name: Publish to PyPI - wavelite
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          packages_dir: py/h2o_wavelite/dist
+          password: ${{ secrets.PYPI_WAVELITE_TOKEN }}
+
+      - name: Publish to PyPI - wavelite_web
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          packages_dir: py/h2o_wavelite_web/dist
+          password: ${{ secrets.PYPI_WAVELITE_WEB_TOKEN }}
diff --git a/Makefile b/Makefile
index 4826cebf9e..1f723b6929 100644
--- a/Makefile
+++ b/Makefile
@@ -205,6 +205,12 @@ publish-vsc-extension: ## Publish VS Code extension
 publish-university:
 	cd university && $(MAKE) publish
 	
+publish-wavelite:
+	cd ui && npm ci && npm run build
+	cd py && $(MAKE) setup
+	cd py && $(MAKE) build-wavelite
+	cd py && $(MAKE) build-wavelite-web
+	
 .PHONY: tag
 tag: ## Bump version and tag
 	cd py && $(MAKE) tag
diff --git a/py/Makefile b/py/Makefile
index dc8b7ef07d..64a33f5841 100644
--- a/py/Makefile
+++ b/py/Makefile
@@ -22,6 +22,7 @@ build-wavelite:
 .PHONY: build-wavelite-web
 build-wavelite-web: 
 	cd h2o_wavelite_web && $(MAKE) build
+
 setup: ## Install dependencies
 	git clone --depth 1 --branch $(WAVE_ML_VERSION) https://github.com/h2oai/wave-ml.git h2o_wave_ml
 	python3 -m venv venv