diff --git a/Dockerfile b/Dockerfile
index 6f77dc9..1924636 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,4 +25,5 @@ RUN ln -s /usr/share/php/PHP/CodeSniffer/bin/phpcs /usr/local/bin/phpcs && \
 
 USER user
 
-ENTRYPOINT ["/usr/bin/php", "/usr/local/bin/phpcs"]
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/Makefile b/Makefile
index 0aef54b..00300f0 100644
--- a/Makefile
+++ b/Makefile
@@ -7,5 +7,5 @@ build:
 	$(DOCKER) build -t $(IMAGE) .
 
 run:
-	$(DOCKER) run --rm -it $(IMAGE)
+	$(DOCKER) run --rm -it $(IMAGE) --help
 
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..87cf71d
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+EXTRA_ARGS=""
+EXTRA_PIPE=""
+
+#
+# If we're running in GitHub Actions, do some formatting
+#
+if [ -n "${GITHUB_ACTIONS}" ]
+then
+  EXTRA_ARGS="--report=checkstyle"
+  EXTRA_PIPE="| cs2pr"
+fi
+
+# Execute PHPCS
+/usr/bin/php /usr/local/bin/phpcs ${EXTRA_ARGS} "$@" ${EXTRA_PIPE}