diff --git a/CHANGELOG.md b/CHANGELOG.md
index 236b892fc..2860abc1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),
 
+## [3.0.2] - tbd
+
+### Fixed
+
+- Startup of BPDM Gate without supplying any environment variables or property overwrites
+
 ## [3.0.1] - 2022-01-24
 
 ### Security
diff --git a/bpdm-gate/src/main/resources/application.properties b/bpdm-gate/src/main/resources/application.properties
index cd666128c..d580507bd 100644
--- a/bpdm-gate/src/main/resources/application.properties
+++ b/bpdm-gate/src/main/resources/application.properties
@@ -31,12 +31,12 @@ bpdm.bpn.name=Business Partner Number
 bpdm.bpn.id=CX_BPN
 #Handle configuration of CDQ API connection
 bpdm.cdq.host=https://api.cdq.com
-bpdm.cdq.storage=${BPDM_CDQ_STORAGE}
-bpdm.cdq.datasource=${BPDM_CDQ_DATASOURCE}
+bpdm.cdq.storage=${BPDM_CDQ_STORAGE:storage_id}
+bpdm.cdq.datasource=${BPDM_CDQ_DATASOURCE:datasource_id}
 bpdm.cdq.legal-entity-type=LEGAL_ENTITY
 bpdm.cdq.site-type=ORGANIZATIONAL_UNIT
 bpdm.cdq.address-type=BP_ADDRESS
-bpdm.cdq.api-key=${BPDM_CDQ_KEY}
+bpdm.cdq.api-key=${BPDM_CDQ_KEY:}
 bpdm.cdq.data-exchange-api-url=/data-exchange/rest/v4/storages/${bpdm.cdq.storage}
 bpdm.cdq.data-clinic-api-url=/data-clinic/rest/storages/${bpdm.cdq.storage}
 #Springdoc swagger configuration