diff --git a/Dockerfile b/Dockerfile
index 855c91d5..22926587 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,10 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     ENABLE_DATABASE=0; \
     for extra in $EXTRAS; do \
       case "$extra" in \
-        ingest|ingest-core|ingest-documents|ingest-markitdown|ingest-markup|core) ENABLE_DOCUMENTS=1 ;; \
-        media|media-core|media-image|media-audio|media-video) ENABLE_MEDIA=1 ;; \
-        tools|tool-web-scraping|core) ENABLE_WEB_SCRAPING=1 ;; \
-        database|database-core|database-postgres|database-mysql|database-mssql|database-db2|tool-database) ENABLE_DATABASE=1 ;; \
+        core|ingest|ingest-core|ingest-documents|ingest-markitdown|ingest-markup) ENABLE_DOCUMENTS=1 ;; \
+        core|media|media-core|media-image|media-audio|media-video) ENABLE_MEDIA=1 ;; \
+        core|tools|tool-web-scraping) ENABLE_WEB_SCRAPING=1 ;; \
+        core|tools|tool-database|database|database-core|database-postgres|database-mysql|database-mssql|database-db2) ENABLE_DATABASE=1 ;; \
       esac; \
     done; \
     apt update; \
diff --git a/settings.yaml b/settings.yaml
index c79dbab8..7d3a3370 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -272,10 +272,10 @@ brave:
   rate_limit: ${PGPT_BRAVE_RATE_LIMIT:1}
 
 skills:
-  database: ${SKILLS_DATABASE:sqlite}
-  storage_provider: ${SKILLS_STORAGE_PROVIDER:local}
-  skill_injection_mode: ${SKILL_INJECTION_MODE:system_prompt}
-  maximum_loaded_skills: ${SKILL_MAXIMUM_LOADED_SKILLS:1}
+  database: ${PGPT_SKILLS_DATABASE:sqlite}
+  storage_provider: ${PGPT_SKILLS_STORAGE_PROVIDER:local}
+  skill_injection_mode: ${PGPT_SKILL_INJECTION_MODE:system_prompt}
+  maximum_loaded_skills: ${PGPT_SKILL_MAXIMUM_LOADED_SKILLS:1}
 
 semaphore:
   mode: ${PGPT_SEMAPHORE_MODE:memory}