diff --git a/.dockerignore b/.dockerignore
index f9eab8e..ca17e14 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,3 +3,4 @@ LICENSE
 README.md
 .arc*
 utils/*
+config/*
diff --git a/.gitignore b/.gitignore
index c00df13..aedf872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *.deb
+/config/openfire/data/*
+/config/openfire/logs/*
diff --git a/Dockerfile b/Dockerfile
index 01a668b..9b5473b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:17-jdk-slim-bullseye
-
-ENV OPENFIRE_VERSION=4.7.4 \
+ARG OPENFIRE_VERSION=4.7.4
+ENV OPENFIRE_VERSION=${OPENFIRE_VERSION} \
     OPENFIRE_USER=openfire \
     OPENFIRE_DATA_DIR=/var/lib/openfire \
     OPENFIRE_LOG_DIR=/var/log/openfire
diff --git a/Makefile b/Makefile
index 976be2e..087fedc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,19 @@
+version=4.7.4
+
 all: build
 
 build:
-	@docker build --tag=gizmotronic/openfire .
+	@docker build --tag=openfire --build-arg OPENFIRE_VERSION=$(version)  .
 
 release: build
-	@docker build --tag=gizmotronic/openfire:$(shell cat VERSION) .
+	@docker build --tag=openfire:$(version) --build-arg OPENFIRE_VERSION=$(version) .
+	@echo $(version) > VERSION
+
+run: release
+	@OPENFIRE_VERSION=$(version) docker compose run --rm openfire
+
+help:
+	@echo "Targets:            build, release, run"
+	@echo "Optional parameter: version=x.y.z"
+	@echo "Example:            make release version=4.7.4"
+	@echo "For Openfire version information see https://github.com/igniterealtime/Openfire/releases"
diff --git a/docker-compose.yml b/docker-compose.yml
index 0bb852e..b10b4d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,12 @@
 version: '2'
 services:
   openfire:
-    image: nasqueron/openfire:4.7.4
+    image: openfire:${OPENFIRE_VERSION}
     ports:
       - "9090:9090/tcp"
       - "9091:9091/tcp"
       - "5222:5222/tcp"
       - "7777:7777/tcp"
     volumes:
-      - /srv/docker/openfire/data:/var/lib/openfire
-      - /srv/docker/openfire/logs:/var/log/openfire
+      - ./config/docker/openfire/data:/var/lib/openfire
+      - ./config/docker/openfire/logs:/var/log/openfire