diff --git a/pytorch_lightning/setup_tools.py b/pytorch_lightning/setup_tools.py
index 071ec050ce..21fa4640da 100644
--- a/pytorch_lightning/setup_tools.py
+++ b/pytorch_lightning/setup_tools.py
@@ -169,10 +169,11 @@ def _load_long_description(path_dir: str) -> str:
 
     # readthedocs badge
     text = text.replace('badge/?version=stable', f'badge/?version={__version__}')
+    text = text.replace('pytorch-lightning.readthedocs.io/en/stable/', f'pytorch-lightning.readthedocs.io/en/{__version__}')
     # codecov badge
     text = text.replace('/branch/master/graph/badge.svg', f'/release/{__version__}/graph/badge.svg')
     # replace github badges for release ones
-    text = text.replace('badge.svg?branch=master&event=push', f'badge.svg?branch={__version__}&event=release')
+    text = text.replace('badge.svg?branch=master&event=push', f'badge.svg?tag={__version__}')
 
     # # https://github.com/Borda/pytorch-lightning/releases/download/1.1.0a6/codecov_badge.png
     # github_release_url = os.path.join(__homepage__, "releases", "download", __version__)