diff --git a/.gitignore b/.gitignore
index ee641bb..00ecc72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ tmp-build
 pkg_tawk_UNZIPFIRST.zip
 *.zip
 ./build/tawkto
+docker/bin
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..184d568
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,17 @@
+ARG JOOMLA_IMAGE_VERSION
+
+FROM joomla:${JOOMLA_IMAGE_VERSION}
+
+ARG JOOMLA_DB_HOST_ARG \
+	JOOMLA_DB_USER_ARG \
+	JOOMLA_DB_PASSWORD_ARG \
+	JOOMLA_DB_NAME_ARG
+
+ENV JOOMLA_DB_HOST=${JOOMLA_DB_HOST_ARG} \
+	JOOMLA_DB_USER=${JOOMLA_DB_USER_ARG} \
+	JOOMLA_DB_PASSWORD=${JOOMLA_DB_PASSWORD_ARG} \
+	JOOMLA_DB_NAME=${JOOMLA_DB_NAME_ARG}
+
+COPY --chown=www-data:www-data ./bin/tawkto/mod_tawkto /var/www/html/modules/mod_tawkto
+COPY --chown=www-data:www-data ./bin/tawkto/plg_tawkto /var/www/html/plugins/system/tawkto
+
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 0000000..a1263af
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e;
+
+build_dir=$(dirname $0);
+module_dir=$build_dir/bin/tawkto;
+
+if [ -d "$module_dir" ]; then
+	echo "Removing existing module folder";
+	rm -r $module_dir;
+fi
+
+echo "Creating module folder";
+mkdir -p $module_dir;
+
+echo "Copying files to module folder";
+cp -r $build_dir/../mod_tawkto $module_dir
+cp -r $build_dir/../plg_tawkto $module_dir
+
+echo "Done building module folder";
+
+echo "Building docker image"
+if [ -z $1 ]; then
+	docker-compose build;
+else
+	docker-compose --env-file $1 build;
+fi
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 38b43fa..079614d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,14 +14,16 @@ services:
   web:
     depends_on:
       - db
-    image: joomla:${JOOMLA_IMAGE_VERSION}
+    build:
+      context: .
+      args:
+        JOOMLA_IMAGE_VERSION: ${JOOMLA_IMAGE_VERSION}
+        JOOMLA_DB_HOST_ARG: db
+        JOOMLA_DB_USER_ARG: joomla
+        JOOMLA_DB_PASSWORD_ARG: joomla
+        JOOMLA_DB_NAME_ARG: joomla
     ports:
       - 8000:80
-    environment:
-      JOOMLA_DB_HOST: db
-      JOOMLA_DB_USER: joomla
-      JOOMLA_DB_PASSWORD: joomla
-      JOOMLA_DB_NAME: joomla
     volumes:
       - web_data:/var/www/html
 volumes: