diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 00000000..8e0d7410
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,19 @@
+name-template: 'v$NEXT_PATCH_VERSION 🌈'
+tag-template: 'v$NEXT_PATCH_VERSION'
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+template: |
+  ## Changes
+
+  $CHANGES
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 00000000..4dd548c0
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,13 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 47222f2f..ef9568eb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
       - REACT_APP_WS_URL=localhost
       - REACT_APP_WS_PORT=8080
       - REACT_APP_CLIENT_ID=${CLIENT_ID}
+      - GOOGLE_AUTH_DOMAIN=${GOOGLE_AUTH_DOMAIN}
   jukebox-api:
     container_name: jukebox-api
     build:
diff --git a/frontend/src/App.js b/frontend/src/App.js
index db60af9a..c12f4c64 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -16,7 +16,7 @@ const store = createStore(jukeboxApp, composeEnhancers(applyMiddleware(jukeboxMi
 const App = () => {
   const googleAuth = useGoogleLogin({
     clientId: process.env.REACT_APP_CLIENT_ID,
-    hostedDomain: 'kyanmedia.com'
+    hostedDomain: process.env.GOOGLE_AUTH_DOMAIN
   })
 
   return (