diff --git a/Makefile b/Makefile
index 20edbb9..d5a49d6 100644
--- a/Makefile
+++ b/Makefile
@@ -42,15 +42,15 @@ config:
 	@echo "Configuring docker for environment '$(ENV)'"
 
 	@echo "  --> Generating mysql auth file"
-	@cat conf/env/nextcloud-mysql.env \
+	@cat conf/env/mysql.env \
 		| python -c "import sys; import string; v=sys.stdin.readline().split('MYSQL_ROOT_PASSWORD=')[1]; print(string.Template(open('conf/build/mysql/my.cnf').read()).substitute({'PASSWORD':v}))" \
-		| docker exec -i $(CLIENT).nextcloud-mysql.$(ENV) sh -c 'cat > /root/.my.cnf'
+		| docker exec -i $(CLIENT).mysql.$(ENV) sh -c 'cat > /root/.my.cnf'
 
 db-backup:
 	@echo "Backing up database"
 	@mkdir -p backup/
-	@docker exec --tty --interactive $(CLIENT).nextcloud-mysql.$(ENV) mysqldump -uroot database > backup/nextcloud-mysql_dump_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+	@docker exec --tty --interactive $(CLIENT).mysql.$(ENV) mysqldump -uroot database > backup/mysql_dump_`date +%d-%m-%Y"_"%H_%M_%S`.sql
 
 db-restore:
-	@echo "Restoring file to database (backup/nextcloud-mysql.sql)"
-	@docker exec -i $(CLIENT).nextcloud-mysql.$(ENV) mysql -uroot database < backup/nextcloud-mysql.sql
+	@echo "Restoring file to database (backup/mysql.sql)"
+	@docker exec -i $(CLIENT).mysql.$(ENV) mysql -uroot database < backup/mysql.sql
diff --git a/conf/docker-compose.dev.yml b/conf/docker-compose.dev.yml
index c216ad5..17c3222 100644
--- a/conf/docker-compose.dev.yml
+++ b/conf/docker-compose.dev.yml
@@ -7,7 +7,7 @@ services:
       - "8888:8888"
     restart: "no"
 
-  nextcloud-mysql:
+  mysql:
     ports:
       - "3306:3306"
     restart: "no"
diff --git a/conf/docker-compose.yml b/conf/docker-compose.yml
index e65925e..b061535 100644
--- a/conf/docker-compose.yml
+++ b/conf/docker-compose.yml
@@ -15,10 +15,10 @@ services:
     restart: always
 
   # https://hub.docker.com/_/mysql/
-  nextcloud-mysql:
+  mysql:
     build: build/mysql
-    container_name: ${CLIENT}.nextcloud-mysql.${ENV}
-    env_file: env/nextcloud-mysql.env
+    container_name: ${CLIENT}.mysql.${ENV}
+    env_file: env/mysql.env
     volumes:
-      - "../volume/nextcloud-mysql/var.lib.mysql:/var/lib/mysql"
+      - "../volume/mysql/var.lib.mysql:/var/lib/mysql"
     restart: always
diff --git a/conf/env/sample/nextcloud-mysql.env b/conf/env/sample/mysql.env
similarity index 100%
rename from conf/env/sample/nextcloud-mysql.env
rename to conf/env/sample/mysql.env