diff --git a/.examples/docker/.env b/.examples/docker/.env
new file mode 100644
index 0000000..d3db96d
--- /dev/null
+++ b/.examples/docker/.env
@@ -0,0 +1,14 @@
+##########################
+# Image Repo Configuration
+##########################
+#
+# optional Image Configuration
+#CONTAINER_APP_DOCKER_IMAGE=librebooking/librebooking
+#CONTAINER_APP_DOCKER_TAG=5.2.0
+#CONTAINER_DB_DOCKER_IMAGE=linuxserver/mariadb
+#CONTAINER_DB_DOCKER_TAG:10.6.13
+
+#CONTAINER_PROXY_DOCKER_IMAGE=nginxproxy/nginx-proxy
+#CONTAINER_PROXY_DOCKER_TAG:latest
+#CONTAINER_ACME_DOCKER_IMAGE=nginxproxy/acme-companion
+#CONTAINER_ACME_DOCKER_TAG:latest
diff --git a/.examples/docker/docker-compose-local.yml b/.examples/docker/docker-compose-local.yml
index 9c713ca..f5c876d 100644
--- a/.examples/docker/docker-compose-local.yml
+++ b/.examples/docker/docker-compose-local.yml
@@ -2,14 +2,14 @@ name: librebooking
 
 services:
   db:
-    image: linuxserver/mariadb:10.6.13
+    image: ${CONTAINER_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${CONTAINER_DB_DOCKER_TAG:-10.6.13}
     restart: always
     volumes:
       - db_conf:/config
     env_file:
       - db.env
   app:
-    image: librebooking/librebooking:develop
+    image: ${CONTAINER_APP_DOCKER_IMAGE:-librebooking/librebooking}:${CONTAINER_APP_DOCKER_TAG:-develop}
     restart: always
     depends_on:
       - db
@@ -22,7 +22,7 @@ services:
     env_file:
       - lb.env
   cron:
-    image: librebooking/librebooking:develop
+    image: ${CONTAINER_APP_DOCKER_IMAGE:-librebooking/librebooking}:${CONTAINER_APP_DOCKER_TAG:-develop}
     restart: always
     command: supercronic /config/lb-jobs-cron
     depends_on:
diff --git a/.examples/docker/docker-compose-public.yml b/.examples/docker/docker-compose-public.yml
index 5f3a339..6be8b7f 100644
--- a/.examples/docker/docker-compose-public.yml
+++ b/.examples/docker/docker-compose-public.yml
@@ -2,7 +2,7 @@ name: librebooking
 
 services:
   proxy:
-     image: nginxproxy/nginx-proxy
+     image: ${CONTAINER_PROXY_DOCKER_IMAGE:-nginxproxy/nginx-proxy}:${CONTAINER_PROXY_DOCKER_TAG:-latest}
      restart: always
      ports:
        - 80:80
@@ -12,7 +12,7 @@ services:
        - proxy_html:/usr/share/nginx/html
        - /var/run/docker.sock:/tmp/docker.sock:ro
   acme:
-    image: nginxproxy/acme-companion
+    image: ${CONTAINER_ACME_DOCKER_IMAGE:-nginxproxy/acme-companion}:${CONTAINER_ACME_DOCKER_TAG:-latest}
     restart: always
     depends_on:
       - proxy
@@ -24,7 +24,7 @@ services:
     environment:
       - DEFAULT_EMAIL=john.doe@acme.org
   db:
-    image: linuxserver/mariadb:10.6.13
+    image: ${CONTAINER_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${CONTAINER_DB_DOCKER_TAG:-10.6.13}
     restart: always
     volumes:
       - db_conf:/config
@@ -33,7 +33,7 @@ services:
     env_file:
       - db.env
   app:
-    image: librebooking/librebooking:develop
+    image: ${CONTAINER_APP_DOCKER_IMAGE:-librebooking/librebooking}:${CONTAINER_APP_DOCKER_TAG:-develop}
     restart: always
     depends_on:
       - db
@@ -49,7 +49,7 @@ services:
       - VIRTUAL_PORT=8080
       - LETSENCRYPT_HOST=acme.org
   cron:
-    image: librebooking/librebooking:develop
+    image: ${CONTAINER_APP_DOCKER_IMAGE:-librebooking/librebooking}:${CONTAINER_APP_DOCKER_TAG:-develop}
     restart: always
     depends_on:
       - app