diff --git a/defaults/main.yml b/defaults/main.yml
index 57a1a68..f192bfe 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -26,7 +26,6 @@ freshrss_healthcheck:
   timeout: 5s
   retries: 5
 
-freshrss_environment: "production"
 freshrss_default_user: "admin"
 freshrss_default_password: "freshrss"
 # Salt is used to make crypto more unique.
diff --git a/templates/services/freshrss-compose.yml.j2 b/templates/services/freshrss-compose.yml.j2
index 0948439..ba4b059 100644
--- a/templates/services/freshrss-compose.yml.j2
+++ b/templates/services/freshrss-compose.yml.j2
@@ -19,7 +19,7 @@ services:
     {% endfor %}
     {% endif %}
     environment:
-      - FRESHRSS_ENVIRONMENT="production"
+      - FRESHRSS_ENVIRONMENT=production
       {% if freshrss_salt is defined and freshrss_salt %}
       - FRESHRSS_SALT={{ freshrss_salt }}
       {% endif %}
@@ -31,7 +31,7 @@ services:
       {% endif %}
       - FRESHRSS_DEFAULT_USER={{ freshrss_default_user }}
       - FRESHRSS_DEFAULT_PASSWORD={{ freshrss_default_password }}
-      - FRESHRSS_ALLOW_ANONYMOUS="{{ freshrss_allow_anonymous }}
+      - FRESHRSS_ALLOW_ANONYMOUS={{ freshrss_allow_anonymous }}
       - FRESHRSS_ALLOW_ANONYMOUS_REFRESH={{ freshrss_allow_anonymous_refresh }}
       - FRESHRSS_AUTH_TYPE={{ freshrss_auth_type }}
       - FRESHRSS_API_ENABLED={{ freshrss_api_enabled }}
@@ -68,12 +68,12 @@ services:
       {% if freshrss_curlopt_proxyuserpwd is defined and freshrss_curlopt_proxyuserpwd %}
       - FRESHRSS_CURLOPT_PROXYUSERPWD={{ freshrss_curlopt_proxyuserpwd }}
       {% endif %}
-      - FRESHRSS_DB_TYPE="pgsql"
+      - FRESHRSS_DB_TYPE=pgsql
       - FRESHRSS_DB_HOST={{ freshrss_postgres_server }}:{{ freshrss_postgres_port }};sslmode={{ freshrss_postgres_ssl_mode }};sslrootcert={{ freshrss_postgres_ssl_rootcert }}
       - FRESHRSS_DB_USER={{ freshrss_postgres_user.name }}
       - FRESHRSS_DB_PASSWORD={{ freshrss_postgres_user.password }}
       - FRESHRSS_DB_BASE={{ freshrss_postgres_db.name }}
-      - FRESHRSS_DB_PREFIX="freshrss_"
+      - FRESHRSS_DB_PREFIX=freshrss_
       - FRESHRSS_EXTENSIONS_ENABLED={{ freshrss_extensions_enabled | join(',') }}
     {% if freshrss_memory_limit is defined %}
     mem_limit: {{ freshrss_memory_limit }}