diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 71903353..7c52ba4f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ In general, I'm happy to merge PRs, but I recommend filling a ticket and ask fir
 Overview:
 ```
 |-- benchmark --A benchmark tool to test the speed of the app (not needed for development)
-|-- demo -- contains some sample photo for https://pigallery2.herokuapp.com/  (not needed for development)
+|-- demo -- contains some sample photo for https://pigallery2.onrender.com/  (not needed for development)
 |-- docker -- contains all docker and docker realted configurations (this is the recommended way for app deplyoment)
 |-- docs -- webpage for http://bpatrik.github.io/pigallery2/
 
diff --git a/README.md b/README.md
index 054baa5d..b223e0f7 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/bpatrik/pigallery2.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/bpatrik/pigallery2/context:javascript)
 [![Build Status](https://travis-ci.org/bpatrik/pigallery2.svg?branch=master)](https://travis-ci.org/bpatrik/pigallery2)
 [![Coverage Status](https://coveralls.io/repos/github/bpatrik/pigallery2/badge.svg?branch=master)](https://coveralls.io/github/bpatrik/pigallery2?branch=master)
-[![Heroku](https://heroku-badge.herokuapp.com/?app=pigallery2&style=flat)](https://pigallery2.herokuapp.com)
 [![Docker build](https://github.com/bpatrik/pigallery2/workflows/docker-buildx/badge.svg)](https://github.com/bpatrik/pigallery2/actions)
 [![dependencies Status](https://david-dm.org/bpatrik/pigallery2/status.svg)](https://david-dm.org/bpatrik/pigallery2)
  
@@ -21,7 +20,7 @@ This is a **fast** (like faster than your PC fast) **directory-first photo galle
  * 📁 Optimized for galleries with <100K photos with <5k photos/folder
 
 ## Live Demo
-Live Demo @ heroku: https://pigallery2.herokuapp.com/ 
+Live Demo @ render: https://pigallery2.onrender.com/ 
  - the demo page **first load** might take up **30s**: the time while the free webservice boots up
 
 ![PiGallery2 - Animated gif demo](docs/demo.gif)
diff --git a/docs/index.html b/docs/index.html
index 1f12b278..3f2d03fe 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -53,7 +53,7 @@
         <h3>
           PiGallery 2 is a self-hosted directory-first photo gallery website.
         </h3>
-        <a href="https://pigallery2.herokuapp.com/">Try our live demo! <span class="small">(First load may take up 30s, while the server boots up)</span></a>
+        <a href="https://pigallery2.onrender.com/">Try our live demo! <span class="small">(First load may take up 30s, while the server boots up)</span></a>
 
       </div>
 
@@ -174,7 +174,7 @@
       <div class="col">
         <h3>Easy settings</h3>
         PiGallery2 has a rich settings page where you can easily set up the gallery.
-        <a href="https://pigallery2.herokuapp.com/admin">Click here to see all the setting in the live demo.</a>
+        <a href="https://pigallery2.onrender.com/admin">Click here to see all the setting in the live demo.</a>
       </div>
       <div class="col-12 col-md-8">
         <img class="card-img-right" src="assets/settings.jpg" style="width: 100%">