diff --git a/Dockerfile b/Dockerfile
index bc2f13b..f1dc118 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,4 +20,5 @@ RUN python -m pip install --no-cache-dir -r requirements.txt
 # Copy the rest of the application code
 COPY --chown=app:app . .
 
-CMD ["sh", "enrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/app/entrypoint.sh"]
+CMD ["run"]
diff --git a/entrypoint.sh b/entrypoint.sh
old mode 100644
new mode 100755
index 8b9819b..e0596df
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,3 +1,30 @@
-# Build and publish the tracking lists for safebrowsing and webkit
-python lists2safebrowsing.py
-python lists2webkit.py
\ No newline at end of file
+#!/usr/bin/env bash
+
+_usage() {
+  cat <<EOF
+usage: ${0} [run]
+
+arguments:
+  run    main entrypoint, execute shavar list creation scripts and exit
+
+EOF
+}
+
+if [[ "${#}" -gt 0 ]]; then
+  CMD=${1} && shift
+
+  case "${CMD}" in
+    run)
+      python lists2safebrowsing.py
+      python lists2webkit.py
+      ;;
+
+    *)
+      echo "ERROR: unknown command: \"${CMD}\""
+      _usage && exit 1
+      ;;
+  esac
+
+else
+  _usage && exit
+fi