diff --git a/kaavapino/settings.py b/kaavapino/settings.py
index 5b2c32a2..6489f0b0 100644
--- a/kaavapino/settings.py
+++ b/kaavapino/settings.py
@@ -47,18 +47,18 @@
     GRAPH_API_CLIENT_SECRET=(str, ""),
 )
 
-SOCIAL_AUTH_TUNNISTAMO_SECRET = os.environ.get("SOCIAL_AUTH_TUNNISTAMO_SECRET")
-SOCIAL_AUTH_TUNNISTAMO_KEY = os.environ.get("SOCIAL_AUTH_TUNNISTAMO_KEY")
-SOCIAL_AUTH_TUNNISTAMO_OIDC_ENDPOINT = os.environ.get("SOCIAL_AUTH_TUNNISTAMO_OIDC_ENDPOINT")
+SOCIAL_AUTH_TUNNISTAMO_SECRET = env("SOCIAL_AUTH_TUNNISTAMO_SECRET")
+SOCIAL_AUTH_TUNNISTAMO_KEY = env("SOCIAL_AUTH_TUNNISTAMO_KEY")
+SOCIAL_AUTH_TUNNISTAMO_OIDC_ENDPOINT = env("SOCIAL_AUTH_TUNNISTAMO_OIDC_ENDPOINT")
 
-KAAVOITUS_API_BASE_URL = os.environ.get("KAAVOITUS_API_BASE_URL")
-KAAVOITUS_API_AUTH_TOKEN = os.environ.get("KAAVOITUS_API_AUTH_TOKEN")
+KAAVOITUS_API_BASE_URL = env("KAAVOITUS_API_BASE_URL")
+KAAVOITUS_API_AUTH_TOKEN = env("KAAVOITUS_API_AUTH_TOKEN")
 
-GRAPH_API_LOGIN_BASE_URL = os.environ.get("GRAPH_API_LOGIN_BASE_URL")
-GRAPH_API_BASE_URL = os.environ.get("GRAPH_API_BASE_URL")
-GRAPH_API_APPLICATION_ID = os.environ.get("GRAPH_API_APPLICATION_ID")
-GRAPH_API_TENANT_ID = os.environ.get("GRAPH_API_TENANT_ID")
-GRAPH_API_CLIENT_SECRET = os.environ.get("GRAPH_API_CLIENT_SECRET")
+GRAPH_API_LOGIN_BASE_URL = env("GRAPH_API_LOGIN_BASE_URL")
+GRAPH_API_BASE_URL = env("GRAPH_API_BASE_URL")
+GRAPH_API_APPLICATION_ID = env("GRAPH_API_APPLICATION_ID")
+GRAPH_API_TENANT_ID = env("GRAPH_API_TENANT_ID")
+GRAPH_API_CLIENT_SECRET = env("GRAPH_API_CLIENT_SECRET")
 
 SOCIAL_AUTH_TUNNISTAMO_AUTH_EXTRA_ARGUMENTS = {'ui_locales': 'fi'}
 
@@ -67,14 +67,13 @@
 if os.path.exists(env_file):
     env.read_env(env_file)
 
-DEBUG = env.bool("DEBUG")
-SECRET_KEY = env.str("SECRET_KEY")
+DEBUG = env("DEBUG")
+SECRET_KEY = env("SECRET_KEY")
 
 if DEBUG and not SECRET_KEY:
     SECRET_KEY = "xxx"
 
-#ALLOWED_HOSTS = env.list("ALLOWED_HOSTS")
-ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS').split(',')
+ALLOWED_HOSTS = env("ALLOWED_HOSTS")
 JWT_AUTH = {
     'JWT_AUDIENCE': os.environ.get('JWT_AUDIENCE'),
     'JWT_SECRET_KEY': os.environ.get('JWT_SECRET_KEY'),
@@ -89,10 +88,10 @@
 
 vars().update(env.email_url())  # EMAIL_BACKEND etc.
 
-STATIC_URL = env.str("STATIC_URL")
-MEDIA_URL = env.str("MEDIA_URL")
-STATIC_ROOT = str(env("STATIC_ROOT"))
-MEDIA_ROOT = str(env("MEDIA_ROOT"))
+STATIC_URL = env("STATIC_URL")
+MEDIA_URL = env("MEDIA_URL")
+STATIC_ROOT = env("STATIC_ROOT")
+MEDIA_ROOT = env("MEDIA_ROOT")
 
 ROOT_URLCONF = "kaavapino.urls"
 WSGI_APPLICATION = "kaavapino.wsgi.application"
@@ -113,7 +112,7 @@
 except Exception:
     version = None
 
-RAVEN_CONFIG = {"dsn": env.str("SENTRY_DSN"), "release": version}
+RAVEN_CONFIG = {"dsn": env("SENTRY_DSN"), "release": version}
 
 INSTALLED_APPS = [
     "helusers.apps.HelusersConfig",
@@ -194,10 +193,10 @@
 OIDC_AUTH = {"OIDC_LEEWAY": 3600}
 
 OIDC_API_TOKEN_AUTH = {
-    "AUDIENCE": env.str("TOKEN_AUTH_ACCEPTED_AUDIENCE"),
-    "API_SCOPE_PREFIX": env.str("TOKEN_AUTH_ACCEPTED_SCOPE_PREFIX"),
-    "REQUIRE_API_SCOPE_FOR_AUTHENTICATION": env.bool("TOKEN_AUTH_REQUIRE_SCOPE_PREFIX"),
-    "ISSUER": env.str("TOKEN_AUTH_AUTHSERVER_URL"),
+    "AUDIENCE": env("TOKEN_AUTH_ACCEPTED_AUDIENCE"),
+    "API_SCOPE_PREFIX": env("TOKEN_AUTH_ACCEPTED_SCOPE_PREFIX"),
+    "REQUIRE_API_SCOPE_FOR_AUTHENTICATION": env("TOKEN_AUTH_REQUIRE_SCOPE_PREFIX"),
+    "ISSUER": env("TOKEN_AUTH_AUTHSERVER_URL"),
 }
 
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
@@ -233,7 +232,7 @@
 PRIVATE_STORAGE_ROOT = MEDIA_ROOT
 
 
-NGINX_X_ACCEL = env.bool("NGINX_X_ACCEL")
+NGINX_X_ACCEL = env("NGINX_X_ACCEL")
 if not DEBUG and NGINX_X_ACCEL:
     PRIVATE_STORAGE_SERVER = "nginx"
     PRIVATE_STORAGE_INTERNAL_URL = "/private-x-accel-redirect/"
@@ -248,6 +247,6 @@
 ACTSTREAM_SETTINGS = {"USE_JSONFIELD": True}
 
 
-USE_X_FORWARDED_HOST = env.bool("USE_X_FORWARDED_HOST")
-CSRF_COOKIE_DOMAIN = env.str("CSRF_COOKIE_DOMAIN")
-CSRF_TRUSTED_ORIGINS = os.environ.get('CSRF_TRUSTED_ORIGINS').split(',')
+USE_X_FORWARDED_HOST = env("USE_X_FORWARDED_HOST")
+CSRF_COOKIE_DOMAIN = env("CSRF_COOKIE_DOMAIN")
+CSRF_TRUSTED_ORIGINS = env("CSRF_TRUSTED_ORIGINS")