diff --git a/Dockerfile b/Dockerfile
index 4189f9a..f4dda48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,9 +54,8 @@ COPY util/webtiles-init-player.sh /app/util/
 COPY webserver/config.py /app/webserver/
 COPY webserver/games.d/* /app/webserver/games.d/
 
-# Adjustments for the container
-RUN mkdir -p /data/rcs && \
-  mkdir -p /data/webserver
+# Copy over the entrypoint
+COPY scripts/entrypoint-webtiles.sh /app/entrypoint.sh
 
 # Clean up unnecessary package lists
 RUN rm -rf /var/lib/apt/lists/*
@@ -68,4 +67,4 @@ EXPOSE 8080
 WORKDIR /app
 
 # Launch WebTiles server
-CMD [ "./webserver/server.py" ]
\ No newline at end of file
+ENTRYPOINT [ "./entrypoint.sh" ]
\ No newline at end of file
diff --git a/Dockerfile.tiles b/Dockerfile.tiles
index 6e369eb..1281ade 100644
--- a/Dockerfile.tiles
+++ b/Dockerfile.tiles
@@ -46,9 +46,8 @@ COPY --from=builder /app/ /app/
 # Copy over custom configs
 COPY settings/init.txt /app/settings/
 
-# Adjustments for the container
-RUN mkdir -p /data/rcs && \
-  mkdir -p /data/webserver
+# COPY over the entrypoint
+COPY scripts/entrypoint-tiles.sh /app/entrypoint.sh
 
 # Clean up unnecessary package lists
 RUN rm -rf /var/lib/apt/lists/*
@@ -59,5 +58,5 @@ EXPOSE 8080
 # Set the WORKDIR
 WORKDIR /app
 
-# Launch WebTiles server
-CMD [ "./webserver/server.py" ]
\ No newline at end of file
+# Launch Tiles
+ENTRYPOINT [ "./entrypoint.sh" ]
\ No newline at end of file
diff --git a/Dockerfile.webtiles b/Dockerfile.webtiles
index 4189f9a..f4dda48 100644
--- a/Dockerfile.webtiles
+++ b/Dockerfile.webtiles
@@ -54,9 +54,8 @@ COPY util/webtiles-init-player.sh /app/util/
 COPY webserver/config.py /app/webserver/
 COPY webserver/games.d/* /app/webserver/games.d/
 
-# Adjustments for the container
-RUN mkdir -p /data/rcs && \
-  mkdir -p /data/webserver
+# Copy over the entrypoint
+COPY scripts/entrypoint-webtiles.sh /app/entrypoint.sh
 
 # Clean up unnecessary package lists
 RUN rm -rf /var/lib/apt/lists/*
@@ -68,4 +67,4 @@ EXPOSE 8080
 WORKDIR /app
 
 # Launch WebTiles server
-CMD [ "./webserver/server.py" ]
\ No newline at end of file
+ENTRYPOINT [ "./entrypoint.sh" ]
\ No newline at end of file
diff --git a/scripts/entrypoint-tiles.sh b/scripts/entrypoint-tiles.sh
new file mode 100755
index 0000000..6874ef9
--- /dev/null
+++ b/scripts/entrypoint-tiles.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env ash
+
+# Variables
+APPDIR=${APPDIR:-"/app"}
+DATA_DIR=${DATA_DIR:-"/data"}
+
+# Functions
+
+# Logic
+
+cd ${APPDIR}
+./webserver/server.py $@
diff --git a/scripts/entrypoint-webtiles.sh b/scripts/entrypoint-webtiles.sh
new file mode 100755
index 0000000..4841a18
--- /dev/null
+++ b/scripts/entrypoint-webtiles.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env ash
+
+# Variables
+APPDIR=${APPDIR:-"/app"}
+DATA_DIR=${DATA_DIR:-"/data"}
+
+# Functions
+
+## Create server directories if they do not exist
+create_server_dirs()
+{
+  mkdir -p ${DATA_DIR}/rcs
+  mkdir -p ${DATA_DIR}/webserver
+}
+
+# Logic
+
+cd ${APPDIR}
+./webserver/server.py $@