diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f17ed25c..e00cc7be3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ deploy-beta:
     - git fetch --force git@github.com:OttoWinter/beta.esphomelib.com.git master:gh-pages
     - git worktree add _build/html gh-pages
     - make ../esphomelib
-    - make deploy
+    - CNAME=beta.esphomelib.com make deploy
     - git -C _build/html push git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages
   only:
     - rc
diff --git a/Makefile b/Makefile
index 533113b44..d050c79c7 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ SOURCEDIR     = .
 BUILDDIR      = _build
 ESPHOMELIB_PATH = ../esphomelib
 ESPHOMELIB_TAG = v1.8.0
+CNAME = esphomelib.com
 
 .PHONY: html cleanhtml doxyg cleandoxyg deploy help webserver Makefile $(ESPHOMELIB_PATH)
 
@@ -33,7 +34,7 @@ $(ESPHOMELIB_PATH):
 
 deploy: cleanhtml doxyg html $(ESPHOMELIB_PATH)
 	touch "$(BUILDDIR)/html/.nojekyll"
-	echo "esphomelib.com" >"$(BUILDDIR)/html/CNAME"
+	echo $CNAME >"$(BUILDDIR)/html/CNAME"
 	git -C "$(BUILDDIR)/html" add --all && git -C "$(BUILDDIR)/html" commit -m "Deploy to gh-pages"
 	@printf "Run \033[0;36mcd $(BUILDDIR)/html && git push origin gh-pages\033[0m to deploy\n"