diff --git a/.drone.jsonnet b/.drone.jsonnet
index cfeb257..732497b 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -39,7 +39,7 @@ local BuildAndTestPipeline(name, image) = {
     }
   ],
   trigger: {
-    event: ["push", "tag"]
+    event: ["pull_request", "push", "tag"]
   }
 };
 
@@ -55,17 +55,22 @@ local BuildAndTestPipeline(name, image) = {
       name: "Deploy on Pypi",
       steps: [
         {
-          name: "Deploy on Pypi",
-          image: "plugins/pypi",
-          settings: {
-            username: {
+          name: "Install twine and deploy",
+          image: "python3.8",
+          environment: {
+            pypi_username: {
               from_secret: 'pypi_username'
             },
-            password: {
+            pypi_password: {
               from_secret: 'pypi_password'
             }
           },
-          distributions: 'bdist_wheel'
+          commands: [
+            "pip install --force-reinstall twine wheel",
+            "python setup.py build bdist_wheel",
+            "set +x",
+            "twine upload --non-interactive -u \"$pypi_username\" -p \"$pypi_password\" dist/*"
+          ]
         },
       ],
       trigger: {
diff --git a/.drone.yml b/.drone.yml
index 22c1581..cc2ef11 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,6 +31,7 @@ steps:
 
 trigger:
   event:
+  - pull_request
   - push
   - tag
 
@@ -67,6 +68,7 @@ steps:
 
 trigger:
   event:
+  - pull_request
   - push
   - tag
 
@@ -80,12 +82,17 @@ platform:
   arch: amd64
 
 steps:
-- name: Deploy on Pypi
-  image: plugins/pypi
-  settings:
-    password:
+- name: Install twine and deploy
+  image: python3.8
+  commands:
+  - pip install --force-reinstall twine wheel
+  - python setup.py build bdist_wheel
+  - set +x
+  - twine upload --non-interactive -u "$pypi_username" -p "$pypi_password" dist/*
+  environment:
+    pypi_password:
       from_secret: pypi_password
-    username:
+    pypi_username:
       from_secret: pypi_username
 
 trigger:
@@ -96,4 +103,8 @@ depends_on:
 - python-3-8
 - python-3-9
 
+---
+kind: signature
+hmac: dfd0429e3b9f364147c56a400cf37466d0cbf0966e613f11b726777553fd9931
+
 ...
diff --git a/.gitignore b/.gitignore
index c2d8c31..f6640f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 .coverage
 .idea/
+.pypirc
 .pytest_cache
 __pycache__
 aiohttp_pydantic.egg-info/
 build/
 coverage.xml
 dist/
-