diff --git a/Dockerfile b/Dockerfile
index 8ceb522..e51b00b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,24 @@
 # ----------------------------------
 # Pterodactyl Core Dockerfile
-# Environment: Java
+# Environment: Java (glibc support)
 # Minimum Panel Version: 0.6.0
 # ----------------------------------
-FROM openjdk:8-jdk-alpine
+FROM        openjdk:8-jre-slim
 
-MAINTAINER Pterodactyl Software, <support@pterodactyl.io>
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
-RUN apk add --no-cache --update curl ca-certificates openssl git tar bash sqlite fontconfig \
- && adduser -D -h /home/container container \
- && ln -s /etc/localtime /etc/timezone
+RUN apt-get update -y \
+ && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
+ && useradd -d /home/container -m container
  
 USER container
 ENV  USER=container HOME=/home/container
 
-WORKDIR /home/container
+USER        container
+ENV         USER=container HOME=/home/container
 
-COPY ./entrypoint.sh /entrypoint.sh
+WORKDIR     /home/container
 
-CMD ["/bin/bash", "/entrypoint.sh"]
+COPY        ./entrypoint.sh /entrypoint.sh
+
+CMD         ["/bin/bash", "/entrypoint.sh"]