diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd96eb0982..d044766ae0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,8 @@ deploy-release:
 deploy-beta:
   tags:
     - esphomedocs
+  variables:
+    CNAME: beta.esphomelib.com
   before_script:
     - mkdir -p /root/.ssh
     - echo "$GITHUB_BETA_PRIVATE_KEY" | tr -d '\r' >/root/.ssh/id_rsa
@@ -47,7 +49,7 @@ deploy-beta:
     - git fetch --force git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages:gh-pages
     - git worktree add _build/html gh-pages
     - make ../esphomelib
-    - CNAME=beta.esphomelib.com make deploy
+    - make deploy
     - git -C _build/html push -f git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages
   only:
     - rc
diff --git a/Makefile b/Makefile
index 76389ebc14..dfdaa2d543 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ $(ESPHOMELIB_PATH):
 
 deploy: cleanhtml doxyg html $(ESPHOMELIB_PATH)
 	touch "$(BUILDDIR)/html/.nojekyll"
-	echo $CNAME >"$(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"