diff --git a/templates/compose/budibase.yaml b/templates/compose/budibase.yaml
index a5ecb8fbb..1364e7137 100644
--- a/templates/compose/budibase.yaml
+++ b/templates/compose/budibase.yaml
@@ -17,8 +17,9 @@ services:
       - INTERNAL_API_KEY=$SERVICE_BASE64_128_BUDIBASE
       - BUDIBASE_ENVIRONMENT=${BUDIBASE_ENVIRONMENT:-PRODUCTION}
       - PORT=4002
-      - API_ENCRYPTION_KEY=$SERVICE_BASE64_64_BUDIBASE
-      - JWT_SECRET=$SERVICE_BASE64_64_BUDIBASE
+      - API_ENCRYPTION_KEY=$SERVICE_BASE64_64_BUDIBASEAPI
+      - ENCRYPTION_KEY=$SERVICE_BASE64_64_BUDIBASE
+      - JWT_SECRET=$SERVICE_BASE64_64_BUDIBASEJWT
       - LOG_LEVEL=info
       - ENABLE_ANALYTICS=${ENABLE_ANALYTICS:-true}
       - REDIS_URL=redis-service:6379