diff --git a/bin/.env b/bin/.env
index 2225f13..9bab47b 100644
--- a/bin/.env
+++ b/bin/.env
@@ -21,16 +21,16 @@ DEFAULT_NGINX_PROXY_IMAGE_VERSION="stable-alpine"
 # Docker-gen default image, version and service name
 #
 DEFAULT_DOCKER_GEN_SERVICE_NAME=docker-gen
-DEFAULT_LETSENCRYPT_IMAGE_NAME="nginxproxy/docker-gen"
-DEFAULT_LETSENCRYPT_IMAGE_VERSION="2.1"
+DEFAULT_DOCKER_GEN_IMAGE_NAME="nginxproxy/docker-gen"
+DEFAULT_DOCKER_GEN_IMAGE_VERSION="0.7.7"
 
 #-----------------------------------------------------------------------
 #
 #  Letsencrypt-nginx-proxy-companion default image, version and service name
 #
 DEFAULT_LETSENCRYPT_SERVICE_NAME=letsencrypt-companion
-DEFAULT_DOCKER_GEN_IMAGE_NAME="nginxproxy/acme-companion"
-DEFAULT_DOCKER_GEN_IMAGE_VERSION="0.7.7"
+DEFAULT_LETSENCRYPT_IMAGE_NAME="nginxproxy/acme-companion"
+DEFAULT_LETSENCRYPT_IMAGE_VERSION="2.1"
 
 #-----------------------------------------------------------------------
 #
diff --git a/docker-compose.yml b/docker-compose.yml
index 4327149..43e2853 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
         max-file: ${NGINX_WEB_LOG_MAX_FILE:-10}
 
   nginx-proxy-automation-gen:
-    image: nginxproxy/docker-gen:${DOCKER_GEN_IMAGE_VERSION:-latest}
+    image: nginxproxy/docker-gen:${DOCKER_GEN_IMAGE_VERSION:-0.7.7}
     command: -notify-sighup ${NGINX_WEB_SEVICE_NAME:-nginx-proxy-automation-web} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
     container_name: ${DOCKER_GEN_SEVICE_NAME:-nginx-proxy-automation-gen}
     restart: always
@@ -48,7 +48,7 @@ services:
         max-file: ${NGINX_GEN_LOG_MAX_FILE:-10}
 
   nginx-proxy-automation-letsencrypt:
-    image: nginxproxy/acme-companion:${NGINX_PROXY_COMPANION_IMAGE_VERSION:-2.0}
+    image: nginxproxy/acme-companion:${NGINX_PROXY_COMPANION_IMAGE_VERSION:-2.1}
     container_name: ${LETS_ENCRYPT_SEVICE_NAME:-nginx-proxy-automation-letsencrypt}
     restart: always
     volumes: