diff --git a/.travis.yml b/.travis.yml
index 490d9b5c..146c0d55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ notifications:
   email: false
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/8b150eaf525c280ec2ac
+      - https://webhooks.gitter.im/e/0a019c8b9828eb9f6a72
     on_success: change
     on_failure: always
     on_start: never
diff --git a/README.md b/README.md
index 215fb1c6..b62f2bef 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Etcher is a powerful OS image flasher built with web technologies to ensure flas
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Build Status](https://travis-ci.org/resin-io/etcher.svg?branch=master)](https://travis-ci.org/resin-io/etcher)
 [![Build status](https://ci.appveyor.com/api/projects/status/e745k1gt39nik0t7/branch/master?svg=true)](https://ci.appveyor.com/project/resin-io/etcher/branch/master)
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/resin-io/chat)
+[![Gitter](https://badges.gitter.im/resin-io/etcher.svg)](https://gitter.im/resin-io/etcher?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Stories in Ready](https://badge.waffle.io/resin-io/etcher.svg?label=in progress&title=In Progress)](https://waffle.io/resin-io/etcher)
 
 ***
diff --git a/SUPPORT.md b/SUPPORT.md
index af1de57c..0b06f1cf 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -5,7 +5,7 @@ There are various ways get support for Etcher if you experience an issue or have
 
 Gitter
 ------
-We have a [Gitter chat room](https://gitter.im/resin-io/chat) for Resin.io which is open to everyone, please come join us :). The room covers Resin.io as a whole, including but not limited to Etcher. Drop us a line there and the Resin.io staff and community users will be happy to assist.
+We have a [Gitter chat room](https://gitter.im/resin-io/etcher) for Resin.io which is open to everyone, please come join us :). The room covers Resin.io as a whole, including but not limited to Etcher. Drop us a line there and the Resin.io staff and community users will be happy to assist.
 
 GitHub
 ------
diff --git a/appveyor.yml b/appveyor.yml
index 38ac74a1..f86fbc02 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,7 @@ test_script:
 notifications:
 
   - provider: Webhook
-    url: https://webhooks.gitter.im/e/3d5ed28fa9ae4c25f46f
+    url: https://webhooks.gitter.im/e/0becb34b32e20d389bb8
     on_build_success: false
     on_build_failure: true
     on_build_status_changed: true
diff --git a/lib/cli/cli.js b/lib/cli/cli.js
index ad61b58d..6d7d7a1a 100644
--- a/lib/cli/cli.js
+++ b/lib/cli/cli.js
@@ -44,7 +44,7 @@ module.exports = yargs
     'If you need help, don\'t hesitate in contacting us at:',
     '',
     '  GitHub: https://github.com/resin-io/etcher-cli/issues/new',
-    '  Gitter: https://gitter.im/resin-io/chat'
+    '  Gitter: https://gitter.im/resin-io/etcher'
   ].join('\n'))
 
   // Examples