diff --git a/Dockerfile.bundle b/Dockerfile.bundle
index ab55992e..2553e026 100644
--- a/Dockerfile.bundle
+++ b/Dockerfile.bundle
@@ -1,7 +1,7 @@
 ARG CORE_IMAGE=datarhei/base:alpine-core-latest
 ARG FFMPEG_IMAGE=datarhei/base:alpine-ffmpeg-latest
 
-FROM $CORE_IMAGE as core
+FROM $CORE_IMAGE AS core
 
 FROM $FFMPEG_IMAGE
 
diff --git a/Dockerfile.whip-test b/Dockerfile.whip-test
index bf74cdad..dececa21 100644
--- a/Dockerfile.whip-test
+++ b/Dockerfile.whip-test
@@ -30,10 +30,21 @@ ENV CORE_STORAGE_DISK_DIR=/core/data
 ENV CORE_DB_DIR=/core/config
 ENV CORE_WHIP_ENABLE=true
 ENV CORE_WHIP_ADDRESS=:8555
+ENV CORE_WHIP_RTSP_ADDRESS=:8554
 ENV CORE_API_AUTH_ENABLE=false
+ENV CORE_RTMP_ENABLE=true
+ENV CORE_SRT_ENABLE=true
+ENV CORE_PLAYOUT_ENABLE=true
+ENV CORE_METRICS_ENABLE=true
+ENV CORE_METRICS_ENABLE_PROMETHEUS=true
 
 EXPOSE 8080/tcp
+EXPOSE 8181/tcp
+EXPOSE 1935/tcp
+EXPOSE 1936/tcp
+EXPOSE 6000/udp
 EXPOSE 8555/tcp
+EXPOSE 8554/tcp
 
 VOLUME ["/core/data", "/core/config"]
 ENTRYPOINT ["/core/bin/run.sh"]