diff --git a/Makefile b/Makefile
index a01c3c3c..071f4234 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,12 @@ build-init:
 	docker buildx create --platform linux/arm/v7,linux/amd64 --use --name multiarch
 
 build-cadence:
-	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence:latest --tag kenellorando/cadence:$(VERSION) --file ./cadence/Dockerfile.multiarch ./cadence/
+	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence:latest --tag kenellorando/cadence:$(VERSION) --file ./cadence/cadence-multiarch.Dockerfile ./cadence/
 
 build-cadence_icecast2:
-	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence_icecast2:latest --tag kenellorando/cadence_icecast2:$(VERSION) --file ./stream/Dockerfile.icecast2 ./stream/
+	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence_icecast2:latest --tag kenellorando/cadence_icecast2:$(VERSION) --file ./cadence/icecast2.Dockerfile ./cadence/
 
 build-cadence_liquidsoap:
-	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence_liquidsoap:latest --tag kenellorando/cadence_liquidsoap:$(VERSION) --file ./stream/Dockerfile.liquidsoap ./stream/
+	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence_liquidsoap:latest --tag kenellorando/cadence_liquidsoap:$(VERSION) --file ./cadence/liquidsoap.Dockerfile ./cadence/
 
 build-all: build-cadence build-cadence_icecast2 build-cadence_liquidsoap
diff --git a/README.md b/README.md
index db165b72..a6eb9074 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 **Cadence** is an all-in-one web radio suite that lets you start a self-hosted radio website.
 
-In minutes, you can create an audio broadcast complete with library search, song request, album artwork, a browser UI, and real-time stream information working out-of-the-box.
+In minutes, you can create an internet audio broadcast complete with library search, song request, album artwork, and a browser UI with real-time stream information working out-of-the-box.
 
 All components are mostly pre-configured so there is hardly any configuration required to get started. Simply provide target directory containing music files, set a few service passwords and hostnames, and deploy!
 
diff --git a/cadence/Dockerfile.multiarch b/cadence/cadence-multiarch.Dockerfile
similarity index 100%
rename from cadence/Dockerfile.multiarch
rename to cadence/cadence-multiarch.Dockerfile
diff --git a/cadence/Dockerfile b/cadence/cadence.Dockerfile
similarity index 100%
rename from cadence/Dockerfile
rename to cadence/cadence.Dockerfile
diff --git a/stream/Dockerfile.icecast2 b/cadence/icecast2.Dockerfile
similarity index 100%
rename from stream/Dockerfile.icecast2
rename to cadence/icecast2.Dockerfile
diff --git a/stream/Dockerfile.liquidsoap b/cadence/liquidsoap.Dockerfile
similarity index 100%
rename from stream/Dockerfile.liquidsoap
rename to cadence/liquidsoap.Dockerfile
diff --git a/config/cadence.env b/config/cadence.env
index b0fad8c9..88f3eebf 100644
--- a/config/cadence.env
+++ b/config/cadence.env
@@ -8,7 +8,7 @@ POSTGRES_PASSWORD=hackme
 
 # Development
 CSERVER_DEVMODE=0
-CSERVER_VERSION=5.3.0
+CSERVER_VERSION=5.3.1
 CSERVER_LOGLEVEL=4
 CSERVER_ROOTPATH=/cadence/server/
 
diff --git a/docker-compose.yml b/docker-compose.yml
index b83bd4f5..335af318 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   icecast2:
     build:
-      dockerfile: ./stream/Dockerfile.icecast2
+      dockerfile: ./cadence/icecast2.Dockerfile
     image: kenellorando/cadence_icecast2:latest
     container_name: icecast2
     restart: always
@@ -35,7 +35,7 @@ services:
 
   liquidsoap:
     build:
-      dockerfile: ./stream/Dockerfile.liquidsoap
+      dockerfile: ./cadence/liquidsoap.Dockerfile
     image: kenellorando/cadence_liquidsoap:latest
     container_name: liquidsoap
     restart: always
@@ -51,8 +51,9 @@ services:
       stream_delivery:
 
   cadence:
-    build: 
-      context: ./cadence/
+    build:
+      context: ./cadence
+      dockerfile: ./cadence.Dockerfile
     image: kenellorando/cadence
     container_name: cadence
     restart: always