diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c9d9b2d..ff22b3b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Removed
 
 - Optional telemetry was removed from the app.
-- Sidekiq Web UI is now protected by basic auth in non-self-hosted mode. (Needs to be tested)
+- Sidekiq Web UI is now protected by basic auth in non-self-hosted mode.
 
 ## Changed
 
 - `rake points:migrate_to_lonlat` task now also tries to extract latitude and longitude from `raw_data` column before using `longitude` and `latitude` columns to fill `lonlat` column.
+- Docker entrypoints are now using `DATABASE_NAME` environment variable to check if Postgres is existing/available.
 
 
 # 0.25.4 - 2025-04-02
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
index 4f3d81ac..5d5296b6 100644
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -5,7 +5,7 @@
     </div>
   <% end %>
 
-  <% if !SELF_HOSTED && devise_mapping.registerable? && controller_name != 'registrations' %>
+  <% if !SELF_HOSTED && devise_mapping&.registerable? && controller_name != 'registrations' %>
     <div class='my-2'>
       <%= link_to "Register", new_registration_path(resource_name) %>
     </div>
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 41b65721..426e5672 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -6,6 +6,7 @@ ENV BUNDLE_PATH=/usr/local/bundle/gems
 ENV RAILS_LOG_TO_STDOUT=true
 ENV RAILS_PORT=3000
 ENV RAILS_ENV=development
+ENV SELF_HOSTED=true
 
 # Install dependencies for application
 RUN apk -U add --no-cache \