diff --git a/defaults/main.yml b/defaults/main.yml
index ebb59aa..67c1e6d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,6 +2,11 @@
 nginx_proxy_container_name: "nginx-proxy"
 nginx_proxy_base_dir: "/srv/nginx_proxy"
 nginx_proxy_network: "nginx_proxy"
+nginx_proxy_nginx_container_image: "nginx-proxy"
+nginx_proxy_nginx_container_image_tag: "latest"
+nginx_proxy_docker_gen_container_image: "nginxproxy/docker-gen"
+nginx_proxy_docker_gen_container_image_tag: "latest"
+
 nginx_proxy_nginx_env_vars:
   TZ: "Europe/Budapest"
   ENABLE_HTTP3: false
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index d7df096..7e9a2d3 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -1,7 +1,7 @@
 #jinja2: lstrip_blocks: "True"
 services:
   nginx-proxy:
-    image: nginx:latest
+    image: {{ nginx_proxy_nginx_container_image }}:{{ nginx_proxy_nginx_container_image_tag }}
     container_name: {{ nginx_proxy_container_name }}
     ports:
       {% for port in nginx_proxy_ports %}
@@ -15,10 +15,10 @@ services:
       {% for key, value in nginx_proxy_nginx_env_vars.items() %}
       - "{{ key }}={{ value }}"
       {% endfor %}
-    restart: always
+    restart: unless-stopped
 
   docker-gen:
-    image: nginxproxy/docker-gen
+    image: {{ nginx_proxy_docker_gen_container_image }}:{{ nginx_proxy_docker_gen_container_image_tag }}
     container_name: {{ nginx_proxy_container_name }}-gen
     command: -notify-sighup {{ nginx_proxy_container_name }} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
     volumes_from: