diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml
new file mode 100644
index 000000000..e5746cb10
--- /dev/null
+++ b/.github/workflows/pypi-release.yml
@@ -0,0 +1,33 @@
+name: Publish package to PyPi
+
+on:
+  release:
+    types: [published]
+
+jobs:
+
+  push:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.5
+
+      - name: Install pip
+        run: pip install pip
+
+      - name: Install Dependencies
+        run: pip install setuptools wheel
+
+      - name: Build package
+        run: python setup.py sdist bdist_wheel
+
+      - name: Publish to PyPi
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_UPLOAD_TOKEN }}
diff --git a/setup.py b/setup.py
index bae0fb723..69380415c 100644
--- a/setup.py
+++ b/setup.py
@@ -2,15 +2,26 @@
 
 from setuptools import setup
 
+with open('README.rst') as readme:
+    long_description = readme.read()
+
 setup(
     name="codejail",
-    version="3.1.3",
+    version="3.1.4",
+    license='Apache',
+    description='CodeJail manages execution of untrusted code in secure sandboxes. It is designed primarily for '
+                'Python execution, but can be used for other languages as well.',
+    long_description=long_description,
+    keywords='edx codejail',
+    author='edX',
+    author_email="oscm@edx.org",
+    url='https://github.com/edx/codejail',
     packages=['codejail'],
     install_requires=['six'],
     zip_safe=False,
     classifiers=[
         "License :: OSI Approved :: Apache Software License",
-        "Operating System :: POSIX :: Ubuntu",
+        "Operating System :: POSIX :: Linux",
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         'Programming Language :: Python',