diff --git a/CHANGELOG.md b/CHANGELOG.md
index d02b51c3..bd521f86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Please read this release notes carefully before upgrading.
 
+Docker-related files were moved to the `docker` directory and some of them were renamed. Before upgrading, study carefully changes in the `docker/docker-compose.yml` file and update your docker-compose file accordingly, so it uses the new files and commands. Copying `docker/docker-compose.yml` blindly may lead to errors.
+
+No volumes were removed or renamed, so with a proper docker-compose file, you should be able to upgrade without any issues. To make it easier comparing your existing docker-compose file with the new one, you may use https://www.diffchecker.com/.
+
 ### Changed
 
 - All docker-related files were moved to the `docker` directory.
diff --git a/docker/docker-compose.production.yml b/docker/docker-compose.production.yml
index df815317..1eb90902 100644
--- a/docker/docker-compose.production.yml
+++ b/docker/docker-compose.production.yml
@@ -36,7 +36,7 @@ services:
       start_period: 30s
       timeout: 10s
   dawarich_app:
-    image: dawarich:prod
+    image: freikin/dawarich:latest
     container_name: dawarich_app
     volumes:
       - dawarich_gem_cache_app:/usr/local/bundle/gems
@@ -94,7 +94,7 @@ services:
           cpus: '0.50'    # Limit CPU usage to 50% of one core
           memory: '2G'    # Limit memory usage to 2GB
   dawarich_sidekiq:
-    image: dawarich:prod
+    image: freikin/dawarich:latest
     container_name: dawarich_sidekiq
     volumes:
       - dawarich_gem_cache_sidekiq:/usr/local/bundle/gems
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index e44ab15c..d2154c2c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       timeout: 10s
     # command: postgres -c config_file=/etc/postgresql/postgresql.conf # Use custom config, uncomment if you want to use a custom config
   dawarich_app:
-    image: dawarich:prod
+    image: freikin/dawarich:latest
     container_name: dawarich_app
     volumes:
       - dawarich_gem_cache_app:/usr/local/bundle/gems
@@ -94,7 +94,7 @@ services:
           cpus: '0.50'    # Limit CPU usage to 50% of one core
           memory: '4G'    # Limit memory usage to 4GB
   dawarich_sidekiq:
-    image: dawarich:prod
+    image: freikin/dawarich:latest
     container_name: dawarich_sidekiq
     volumes:
       - dawarich_gem_cache_sidekiq:/usr/local/bundle/gems