diff --git a/.travis.yml b/.travis.yml
index 261a9982e..a3f6360bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -154,8 +154,8 @@ notifications:
 before_deploy:
   - |
     if [[ !("$TRAVIS_TAG" =~ ^v[0-9.]+$) ]]; then
-      git tag -f dev-build-${TRAVIS_BRANCH}
-      git push -f https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git dev-build-${TRAVIS_BRANCH}
+      git tag -f dev-build-${TRAVIS_BRANCH//\//-}
+      git push -f https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git dev-build-${TRAVIS_BRANCH//\//-}
     fi
 deploy:
   - provider: releases
diff --git a/Makefile b/Makefile
index 52ac919f8..4c31f17ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 EXTENSIONS:=inkstitch
 
 # This gets the branch name or the name of the tag
-VERSION:=$(TRAVIS_BRANCH)
+VERSION:=$(subst /,-,$(TRAVIS_BRANCH))
 OS:=$(TRAVIS_OS_NAME)
 ARCH:=$(shell uname -m)