diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..84267b4
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,111 @@
+#
+# LinuxGSM Base Dockerfile
+#
+# https://github.com/GameServerManagers/LinuxGSM-Docker
+#
+
+FROM gameservermanagers/steamcmd:ubuntu-22.04
+
+LABEL maintainer="LinuxGSM <me@danielgibbs.co.uk>"
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV TERM=xterm
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+## Install Base LinuxGSM Requirements
+RUN echo "**** Install Base LinuxGSM Requirements ****" \
+    && apt-get update \
+    && apt-get install -y software-properties-common \
+    && add-apt-repository multiverse \
+    && apt-get update \
+    && apt-get install -y \
+    bc \
+    binutils \
+    bsdmainutils \
+    bzip2 \
+    ca-certificates \
+	cron \
+    cpio \
+    curl \
+    distro-info \
+    file \
+    gzip \
+    hostname \
+    jq \
+    lib32gcc-s1 \
+    lib32stdc++6 \
+    netcat \
+    python3 \
+    tar \
+    tmux \
+    unzip \
+    util-linux \
+    wget \
+    xz-utils \
+    # Docker Extras
+    cron \
+    iproute2 \
+    iputils-ping \
+    nano \
+    vim \
+    sudo \
+    tini
+
+# Install NodeJS
+RUN echo "**** Install NodeJS ****" \
+    && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
+    && apt-get update && apt-get install -y nodejs
+
+# Install GameDig https://docs.linuxgsm.com/requirements/gamedig
+RUN echo "**** Install GameDig ****" \
+    && npm install -g gamedig
+
+# Install Cleanup
+RUN echo "**** Cleanup ****"  \
+    && apt-get -y autoremove \
+    && apt-get -y clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /tmp/* \
+    && rm -rf /var/tmp/*
+
+##Need use xterm for LinuxGSM##
+
+ENV DEBIAN_FRONTEND noninteractive
+
+ARG USERNAME=linuxgsm
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+## Add linuxgsm user
+RUN echo "**** Add linuxgsm user ****" \
+# Create the user
+    && groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    #
+    # [Optional] Add sudo support. Omit if you don't need to install software after connecting.
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME \
+    && chown $USERNAME:$USERNAME /home/$USERNAME
+
+## Download linuxgsm.sh
+RUN echo "**** Download linuxgsm.sh ****" \
+    && set -ex \
+    && wget -O linuxgsm.sh https://linuxgsm.sh \
+    && chmod +x /linuxgsm.sh
+
+WORKDIR /home/linuxgsm
+ENV PATH=$PATH:/home/linuxgsm
+USER linuxgsm
+
+# Add LinuxGSM cronjobs
+RUN (crontab -l 2>/dev/null; echo "*/5 * * * * /home/linuxgsm/*server monitor > /dev/null 2>&1") | crontab -
+RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /home/linuxgsm/*server update > /dev/null 2>&1") | crontab -
+RUN (crontab -l 2>/dev/null; echo "0 1 * * 0 /home/linuxgsm/*server update-lgsm > /dev/null 2>&1") | crontab -
+
+# Run SteamCMD as LinuxGSM user
+RUN steamcmd +quit
+
+COPY entrypoint.sh /home/linuxgsm/entrypoint.sh
+
+ENTRYPOINT [ "/usr/bin/tini", "--" ]
+CMD [ "bash","./entrypoint.sh" ]
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..499ebdb
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+exit_handler () {
+	# Execute the  shutdown commands
+    echo "recieved SIGTERM stopping ${GAMESERVER}"
+	./${GAMESERVER} stop
+	exit 0
+}
+
+# Exit trap
+echo "loading exit trap"
+trap exit_handler SIGTERM
+
+echo -e "Welcome to the LinuxGSM Docker"
+echo -e "================================================================================"
+echo -e "GAMESERVER: ${GAMESERVER}"
+echo -e "UID: $UID"
+echo -e ""
+echo -e "LGSM_GITHUBUSER: ${LGSM_GITHUBUSER}"
+echo -e "LGSM_GITHUBREPO: ${LGSM_GITHUBREPO}"
+echo -e "LGSM_GITHUBBRANCH: ${LGSM_GITHUBBRANCH}"
+
+echo -e ""
+echo -e "Initalising"
+echo -e "================================================================================"
+# Correct permissions in home dir
+echo "update permissions for linuxgsm"
+sudo chown -R linuxgsm:linuxgsm /home/linuxgsm
+
+# Copy linuxgsm.sh into homedir
+if [ ! -e ~/linuxgsm.sh ]; then
+    echo "copying linuxgsm.sh to /home/linuxgsm"
+    cp /linuxgsm.sh ~/linuxgsm.sh
+fi
+
+# Setup game server
+if [ ! -f "${GAMESERVER}" ]; then
+    echo "creating ./${GAMESERVER}"
+   ./linuxgsm.sh ${GAMESERVER}
+fi
+
+# Install game server
+if [ -z "$(ls -A -- "serverfiles")" ]; then
+    echo "installing ${GAMESERVER}"
+    ./${GAMESERVER} auto-install
+fi
+
+echo "starting cron"
+sudo cron
+
+# Update game server
+echo ""
+echo "updating ${GAMESERVER}"
+./${GAMESERVER} update
+
+echo ""
+echo "starting ${GAMESERVER}"
+./${GAMESERVER} start
+sleep 2
+./${GAMESERVER} details
+sleep 2
+tail -f log/script/*
+
+# with no command, just spawn a running container suitable for exec's
+if [ $# = 0 ]; then
+    tail -f /dev/null
+else
+    # execute the command passed through docker
+    "$@"
+
+    # if this command was a server start cmd
+    # to get around LinuxGSM running everything in
+    # tmux;
+    # we attempt to attach to tmux to track the server
+    # this keeps the container running
+    # when invoked via docker run
+    # but requires -it or at least -t
+    tmux set -g status off && tmux attach 2> /dev/null
+fi
+
+exec "$@"