diff --git a/config/secrets.yml b/config/secrets.yml
index 41ec84162..b9af9e661 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -97,7 +97,7 @@ storage_default: &storage_default
   provider: <%= Decidim::Env.new("STORAGE_PROVIDER", "local").to_s %>
   cdn_host: <%= ENV["STORAGE_CDN_HOST"] %>
   s3:
-    public: <%= Decidim::Env.new("AWS_PUBLIC", "false").to_boolean_string %>
+    public: <%= Decidim::Env.new("AWS_PUBLIC", "false").present? %>
     access_key_id: <%= ENV["AWS_ACCESS_KEY_ID"] %>
     secret_access_key: <%= ENV["AWS_SECRET_ACCESS_KEY"] %>
     region: <%= ENV["AWS_REGION"] %>
diff --git a/config/storage.yml b/config/storage.yml
index 67d9905ed..c9ec44b5e 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -8,7 +8,7 @@ local:
 
 s3:
   service: S3
-  public: <%= Rails.application.secrets.dig(:storage, :s3, :public) %>
+  <%= "public: true" if Rails.application.secrets.dig(:storage, :s3, :public) %>
   access_key_id: <%= Rails.application.secrets.dig(:storage, :s3, :access_key_id) %>
   secret_access_key: <%= Rails.application.secrets.dig(:storage, :s3, :secret_access_key) %>
   bucket: <%= Rails.application.secrets.dig(:storage, :s3, :bucket) %>