diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ff6c60a..57770276 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,32 +17,6 @@ jobs:
       - checkout
       - run: npm ci
       - run: npm run build
-      - persist_to_workspace:
-          root: .
-          paths:
-            - public
-
-  deploy:
-    docker:
-      - image: olizilla/ipfs-dns-deploy
-        environment:
-          DOMAIN: awesome.ipfs.io
-          BUILD_DIR: public
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Deploy website to IPFS
-          command: |
-            pin_name="$DOMAIN build $CIRCLE_BUILD_NUMBER"
-
-            hash=$(pin-to-cluster.sh "$pin_name" /tmp/workspace/$BUILD_DIR)
-
-            echo "Website added to IPFS: https://ipfs.io/ipfs/$hash"
-
-            if [ "$CIRCLE_BRANCH" == "master" ] ; then
-              dnslink-dnsimple -d $DOMAIN -r _dnslink -l /ipfs/$hash
-            fi
 
 workflows:
   version: 2
@@ -56,11 +30,7 @@ workflows:
                 - master
     jobs:
       - awesome
-  build-deploy:
+  checks:
     jobs:
       - awesome
       - build
-      - deploy:
-          context: ipfs-dns-deploy
-          requires:
-            - build
diff --git a/README.md b/README.md
index 311355b1..7b9ee160 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,6 @@
 # Awesome IPFS [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
 
-[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
-[![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
-[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
-
-> Useful resources for using [IPFS](https://ipfs.io) and building things on top of it
+> Useful resources for using [IPFS](https://ipfs.tech) and building things on top of it
 
 _This list is for projects, tools, or pretty much any things related to IPFS that are totally_ **awesome**_. This is for products which are already awesome - if you have plans for cool stuff to do with IPFS, you should build it, and then link it here. If you have an idea for an awesome thing to do with IPFS, a good place to ask about it might be in [our IPFS Discuss Forums](https://discuss.ipfs.io)._
 
diff --git a/scripts/readme-template.md b/scripts/readme-template.md
index 097fb1a2..48487022 100644
--- a/scripts/readme-template.md
+++ b/scripts/readme-template.md
@@ -1,10 +1,6 @@
 # Awesome IPFS [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
 
-[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
-[![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
-[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
-
-> Useful resources for using [IPFS](https://ipfs.io) and building things on top of it
+> Useful resources for using [IPFS](https://ipfs.tech) and building things on top of it
 
 _This list is for projects, tools, or pretty much any things related to IPFS that are totally_ **awesome**_. This is for products which are already awesome - if you have plans for cool stuff to do with IPFS, you should build it, and then link it here. If you have an idea for an awesome thing to do with IPFS, a good place to ask about it might be in [our IPFS Discuss Forums](https://discuss.ipfs.io)._
 
diff --git a/src/config.yaml b/src/config.yaml
index add7ed2a..af2607f2 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1,8 +1,9 @@
-baseurl: ''
+baseurl: 'https://awesome.ipfs.tech'
 relativeurls: true
 languageCode: en
 pluralizelisttitles: false
 removePathAccents: true
+canonifyURLs: true
 title: Awesome IPFS
 
 disableKinds: