diff --git a/Dockerfile b/Dockerfile
index 5460a64f8c4467c83994da062a99d739ea353e75..444ed1b221264c2d8eb80251e0e3d54d8b7593ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
-FROM php:7.3-apache
+FROM k8r.eu/justjanne/php:latest
 
-RUN apt-get update && apt-get install -y \
-    libpq-dev \
-    libsqlite3-dev
+RUN apk add --no-cache --update \
+    php-json \
+    php-pdo_sqlite \
+    php-pdo_pgsql
 
-RUN docker-php-ext-install pdo pdo_pgsql pdo_sqlite
+USER nobody
 
 ADD . /var/www/html/
\ No newline at end of file
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..183b42e3058c24ec4715f9f3a2eae8ba0d51f7dd
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+IMAGE=k8r.eu/justjanne/quassel-rest-search
+TAGS=$(git describe --always --tags HEAD)
+
+docker build -t $IMAGE:$TAGS .
+docker tag $IMAGE:$TAGS $IMAGE:latest
+echo Successfully tagged $IMAGE:latest
+docker push $IMAGE:$TAGS
+docker push $IMAGE:latest
\ No newline at end of file