diff --git a/.github/workflows/upload_to_pypi.yaml b/.github/workflows/upload_to_pypi.yaml
new file mode 100644
index 00000000000..45b4b74d8de
--- /dev/null
+++ b/.github/workflows/upload_to_pypi.yaml
@@ -0,0 +1,29 @@
+name: Upload Python Package
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  deploy:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.7'
+    - name: Build
+      run: |
+        python setup.py sdist bdist_wheel
+    - name: Install Twine
+      run: pip install twine
+    - name: Publish
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        twine upload dist/*
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c514cf88b46..65432d99fd8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -109,19 +109,3 @@ jobs:
           git push
         displayName: "Publish docs to gh-pages"
         condition: and(succeeded(), eq( variables['Agent.OS'], 'Linux' ), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.Reason'], 'IndividualCI'))
-
-      - task: TwineAuthenticate@1
-        inputs:
-          pythonUploadServiceConnection: qcodes_upload_to_pypi
-        condition: and(succeeded(), eq( variables['Agent.OS'], 'Linux' ), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-      - script: |
-          source activate qcodes &&
-          python setup.py bdist_wheel &&
-          python setup.py sdist
-        condition: and(succeeded(), eq( variables['Agent.OS'], 'Linux' ))
-        displayName: "Build dist artifacts"
-      - script: |
-          source activate qcodes &&
-          twine upload -r "qcodes" --config-file $(PYPIRC_PATH) dist/*
-        condition: and(succeeded(), eq( variables['Agent.OS'], 'Linux' ), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-        displayName: "Upload tagged release to PyPi"
diff --git a/setup.cfg b/setup.cfg
index f711634a0d7..39e95cd7b90 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,9 +2,7 @@
 name = qcodes
 maintainer = QCoDeS Core Developers
 maintainer_email = qcodes-support@microsoft.com
-description = Python-based data acquisition framework developed by the
-              Copenhagen / Delft / Sydney / Microsoft quantum computing
-              consortium
+description = Python-based data acquisition framework developed by the Copenhagen / Delft / Sydney / Microsoft quantum computing consortium
 long_description = file: README.rst
 long_description_content_type = text/x-rst
 url = https://github.com/QCoDeS/Qcodes