diff --git a/.bra.toml b/.bra.toml
index f2079a50a39..171a3349ce1 100644
--- a/.bra.toml
+++ b/.bra.toml
@@ -16,7 +16,7 @@ init_cmds = [
     "debug",
     "server",
     "--asset-path",
-    "phoenix/"
+    "assets/"
   ]
 ]
 
@@ -28,6 +28,6 @@ cmds = [
     "debug",
     "server",
     "--asset-path",
-    "phoenix/"
+    "assets/"
   ]
 ]
diff --git a/.gitignore b/.gitignore
index 5c43b464b55..9ceaa32dbe1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@ coverage.out
 /bin
 /dist
 
-/phoenix
+/assets
 
 /pkg/assets/embed.go
diff --git a/Makefile b/Makefile
index 230b5aee03d..f18af89078d 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ sync:
 .PHONY: clean
 clean:
 	go clean -i ./...
-	rm -rf $(BIN) $(DIST) phoenix/
+	rm -rf $(BIN) $(DIST) assets/
 
 .PHONY: fmt
 fmt:
@@ -67,7 +67,7 @@ lint:
 	for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;
 
 .PHONY: generate
-generate: phoenix
+generate: assets
 	go generate $(GENERATE)
 
 .PHONY: changelog
@@ -122,5 +122,5 @@ release-finish: release-copy release-check
 docs:
 	cd docs; hugo
 
-phoenix:
-	mkdir phoenix/ && curl -slL -o- https://github.com/owncloud/phoenix/releases/download/0.2.1/phoenix.tar.gz | tar xvzf - -C phoenix/
+assets:
+	mkdir assets/ && curl -slL -o- https://github.com/owncloud/phoenix/releases/download/0.2.1/phoenix.tar.gz | tar xvzf - -C assets/
diff --git a/pkg/assets/embed.yml b/pkg/assets/embed.yml
index ae73aa546b5..7fee578c20d 100644
--- a/pkg/assets/embed.yml
+++ b/pkg/assets/embed.yml
@@ -10,8 +10,8 @@ compression:
 
 custom:
   - files:
-    - "../../phoenix/"
-    base: "../../phoenix/"
+    - "../../assets/"
+    base: "../../assets/"
     prefix: ""
     exclude:
     - "appinfo/**"