diff --git a/docker/inventree/Dockerfile b/docker/inventree/Dockerfile
index fcba19e964..2911da907a 100644
--- a/docker/inventree/Dockerfile
+++ b/docker/inventree/Dockerfile
@@ -26,6 +26,9 @@ ENV INVENTREE_BACKUP_DIR="${INVENTREE_DATA_DIR}/backup"
 ENV INVENTREE_CONFIG_FILE="${INVENTREE_DATA_DIR}/config.yaml"
 ENV INVENTREE_SECRET_KEY_FILE="${INVENTREE_DATA_DIR}/secret_key.txt"
 
+# Default web server port is 8000
+ENV INVENTREE_WEB_PORT="8000"
+
 # Pass DB configuration through as environment variables
 ENV INVENTREE_DB_ENGINE="${INVENTREE_DB_ENGINE}"
 ENV INVENTREE_DB_NAME="${INVENTREE_DB_NAME}"
@@ -56,14 +59,22 @@ RUN apk add --no-cache git make bash \
     libjpeg-turbo libjpeg-turbo-dev jpeg jpeg-dev \
     libffi libffi-dev \
     zlib zlib-dev
+
+# Cairo deps for WeasyPrint (these will be deprecated once WeasyPrint drops cairo requirement)
 RUN apk add --no-cache cairo cairo-dev pango pango-dev
 RUN apk add --no-cache fontconfig ttf-droid ttf-liberation ttf-dejavu ttf-opensans ttf-ubuntu-font-family font-croscore font-noto
-RUN apk add --no-cache python3
-RUN apk add --no-cache postgresql-contrib postgresql-dev libpq
-RUN apk add --no-cache mariadb-connector-c mariadb-dev
 
-# Create required directories
-#RUN mkdir ${INVENTREE_DATA_DIR}}/media ${INVENTREE_HOME}/static ${INVENTREE_HOME}/backup
+# Python
+RUN apk add --no-cache python3 python3-dev
+
+# SQLite support
+RUN apk add --no-cache sqlite
+
+# PostgreSQL support
+RUN apk add --no-cache postgresql postgresql-contrib postgresql-dev libpq
+
+# MySQL support
+RUN apk add --no-cache mariadb-connector-c mariadb-dev mariadb-client
 
 # Install required python packages
 RUN pip install --upgrade pip setuptools wheel
diff --git a/docker/inventree/start_server.sh b/docker/inventree/start_server.sh
index 0436cd532f..db9f1594ae 100644
--- a/docker/inventree/start_server.sh
+++ b/docker/inventree/start_server.sh
@@ -43,4 +43,4 @@ python manage.py collectstatic --noinput || exit 1
 python manage.py clearsessions || exit 1
 
 # Now we can launch the server
-gunicorn -c $INVENTREE_HOME/gunicorn.conf.py InvenTree.wsgi -b 0.0.0.0:8080
+gunicorn -c $INVENTREE_HOME/gunicorn.conf.py InvenTree.wsgi -b 0.0.0.0:$INVENTREE_WEB_PORT