Merge remote-tracking branch 'origin/release/0.5.3' into main

highmed · Oct 19, 2021 · 5fa9133 · 5fa9133
2 parents 7656bef + 262c737
commit 5fa9133
Show file tree

Hide file tree

Showing 56 changed files with 310 additions and 149 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -1,13 +1,31 @@
-cff-version: 1.1.0
-message: "If you use this software, please cite it as below."
+cff-version: 1.2.0
+message: "If you use this software, please cite both the article from preferred-citation and the software itself."
 authors:
   - family-names: Hund
     given-names: Hauke
   - family-names: Wettstein
     given-names: Reto
+  - name: Contributors of the HiGHmed DSF
+preferred-citation:
+  authors:
+    - family-names: Hund
+      given-names: Hauke
+    - family-names: Wettstein
+      given-names: Reto
+    - family-names: Heidt
+      given-names: Christian M.
+    - family-names: Fegeler
+      given-names: Christian
+  title: "Executing Distributed Healthcare and Research Processes – The HiGHmed Data Sharing Framework"
+  journal: Stud Health Technol Inform
+  volume: 278
+  year: 2021
+  pages: 126-133
+  doi: 10.3233/SHTI210060
+  type: proceedings
 title: "HiGHmed Data Sharing Framework (HiGHmed DSF)"
-version: 0.5.2
-date-released: 2021-09-07
+version: 0.5.3
+date-released: 2021-10-19
 url: https://github.com/highmed/highmed-dsf/wiki
 repository-code: https://github.com/highmed/highmed-dsf
 repository-artifact: https://github.com/highmed/highmed-dsf/releases
@@ -21,8 +39,6 @@ references:
         given-names: Reto
       - family-names: Heidt
         given-names: Christian M.
-      - family-names: Kobylinski
-        given-names: Insa
       - family-names: Fegeler
         given-names: Christian
     title: "Executing Distributed Healthcare and Research Processes – The HiGHmed Data Sharing Framework"
@@ -63,3 +79,19 @@ references:
     year: 2021
     pages: 142-149
     doi: 10.3233/SHTI210062
+  - type: proceedings
+    authors:
+      - family-names: Wettstein
+        given-names: Reto
+      - family-names: Hund
+        given-names: Hauke
+      - family-names: Fegeler
+        given-names: Christian
+      - family-names: Heinze
+        given-names: Oliver
+    title: "Data Sharing in Distributed Architectures – Concept and Implementation in HiGHmed"
+    journal: Stud Health Technol Inform
+    volume: 283
+    year: 2021
+    pages: 111-118
+    doi: 10.3233/SHTI210548
diff --git a/dsf-bpe/dsf-bpe-process-base/pom.xml b/dsf-bpe/dsf-bpe-process-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.5.2</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<dependencies>

diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.5.2</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<dependencies>

diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.5.2</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<dependencies>

diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/org/highmed/dsf/bpe/spring/config/PropertiesConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/org/highmed/dsf/bpe/spring/config/PropertiesConfig.java
@@ -110,10 +110,10 @@ public class PropertiesConfig
 	@Value("${org.highmed.dsf.bpe.process.plugin.directroy:process}")
 	private String processPluginDirectory;
 
-	@Value("#{'${org.highmed.dsf.bpe.process.excluded:}'.split(',')}")
+	@Value("#{'${org.highmed.dsf.bpe.process.excluded:}'.trim().split('(,[ ]?)|(\\n)')}")
 	private List<String> processExcluded;
 
-	@Value("#{'${org.highmed.dsf.bpe.process.retired:}'.split(',')}")
+	@Value("#{'${org.highmed.dsf.bpe.process.retired:}'.trim().split('(,[ ]?)|(\\n)')}")
 	private List<String> processRetired;
 
 	@Value("${org.highmed.dsf.bpe.process.fhir.server.retry.max:-1}")

diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.15_to_7.16.sql b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.15_to_7.16.sql
@@ -0,0 +1,30 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('500', CURRENT_TIMESTAMP, '7.16.0');
+
+create table ACT_RE_CAMFORMDEF (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    KEY_ varchar(255) NOT NULL,
+    VERSION_ integer NOT NULL,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+);
diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-0.5.3.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-0.5.3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+	<changeSet author="camunda.org" id="db.camunda_engine.changelog-0.5.3">
+		<sqlFile dbms="postgresql" encoding="utf8" path="db/camunda/postgres_engine_7.15_to_7.16.sql" />
+	</changeSet>
+
+</databaseChangeLog>
diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml
@@ -18,5 +18,6 @@
 	<include file="db/db.process_states.changelog-0.4.0.xml" />
 
 	<include file="db/db.camunda_engine.changelog-0.5.0.xml" />
+	<include file="db/db.camunda_engine.changelog-0.5.3.xml" />
 
 </databaseChangeLog>
diff --git a/dsf-bpe/dsf-bpe-webservice-client/pom.xml b/dsf-bpe/dsf-bpe-webservice-client/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.5.2</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<dependencies>

diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-pom</artifactId>
-		<version>0.5.2</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<modules>

diff --git a/dsf-docker-test-setup-3medic-ttp-docker/docker-compose.yml b/dsf-docker-test-setup-3medic-ttp-docker/docker-compose.yml
@@ -109,6 +109,7 @@ services:
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_MeDIC_1
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_NAME: Test MeDIC 1
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${MEDIC1_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_TTP: ${TTP_BUNDLE_USER_THUMBPRINT}
       ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${MEDIC1_CONF_USER_THUMBPRINTS}
       ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${MEDIC1_CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
     networks:
@@ -160,6 +161,7 @@ services:
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_MeDIC_2
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_NAME: Test MeDIC 2
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${MEDIC2_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_TTP: ${TTP_BUNDLE_USER_THUMBPRINT}
       ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${MEDIC2_CONF_USER_THUMBPRINTS}
       ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${MEDIC2_CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
     networks:
@@ -211,6 +213,7 @@ services:
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_MeDIC_3
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_NAME: Test MeDIC 3
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${MEDIC3_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_TTP: ${TTP_BUNDLE_USER_THUMBPRINT}
       ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${MEDIC3_CONF_USER_THUMBPRINTS}
       ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${MEDIC3_CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
     networks:
@@ -262,6 +265,9 @@ services:
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_TTP
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_NAME: Test TTP
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${TTP_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_MEDIC1: ${MEDIC1_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_MEDIC2: ${MEDIC2_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_MEDIC3: ${MEDIC3_BUNDLE_USER_THUMBPRINT}
       ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${TTP_CONF_USER_THUMBPRINTS}
       ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${TTP_CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
     networks:
@@ -380,7 +386,7 @@ services:
       ORG_HIGHMED_DSF_BPE_DB_USER_CAMUNDA_USERNAME: medic2_camunda_server_user
       ORG_HIGHMED_DSF_BPE_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_MeDIC_2
       ORG_HIGHMED_DSF_BPE_FHIR_SERVER_BASE_URL: https://medic2-docker/fhir
-      ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: highmedorg_computeFeasibility/0.5.0,highmedorg_computeDataSharing/0.5.0,highmedorg_requestUpdateResources/0.5.0,highmedorg_updateAllowList/0.5.0
+      ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: highmedorg_computeFeasibility/0.5.0, highmedorg_computeDataSharing/0.5.0, highmedorg_requestUpdateResources/0.5.0, highmedorg_updateAllowList/0.5.0
       # property org.highmed.dsf.bpe.allow.list.organization should only be set for testing, do not configure property in production, potential security risk
       ORG_HIGHMED_DSF_BPE_ALLOW_LIST_ORGANIZATION: Test_TTP
     networks:
@@ -439,7 +445,11 @@ services:
       ORG_HIGHMED_DSF_BPE_DB_USER_CAMUNDA_USERNAME: medic3_camunda_server_user
       ORG_HIGHMED_DSF_BPE_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_MeDIC_3
       ORG_HIGHMED_DSF_BPE_FHIR_SERVER_BASE_URL: https://medic3-docker/fhir
-      ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: highmedorg_computeFeasibility/0.5.0,highmedorg_computeDataSharing/0.5.0,highmedorg_requestUpdateResources/0.5.0,highmedorg_updateAllowList/0.5.0
+      ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: >
+        highmedorg_computeFeasibility/0.5.0,
+        highmedorg_computeDataSharing/0.5.0,
+        highmedorg_requestUpdateResources/0.5.0,
+        highmedorg_updateAllowList/0.5.0
       # property org.highmed.dsf.bpe.allow.list.organization should only be set for testing, do not configure property in production, potential security risk
       ORG_HIGHMED_DSF_BPE_ALLOW_LIST_ORGANIZATION: Test_TTP
     networks:
@@ -498,7 +508,14 @@ services:
       ORG_HIGHMED_DSF_BPE_DB_USER_CAMUNDA_USERNAME: ttp_camunda_server_user
       ORG_HIGHMED_DSF_BPE_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_TTP
       ORG_HIGHMED_DSF_BPE_FHIR_SERVER_BASE_URL: https://ttp-docker/fhir
-      ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: highmedorg_executeUpdateResources/0.5.0,highmedorg_downloadAllowList/0.5.0,highmedorg_localServicesIntegration/0.5.0,highmedorg_requestFeasibility/0.5.0,highmedorg_executeFeasibility/0.5.0,highmedorg_requestDataSharing/0.5.0,highmedorg_executeDataSharing/0.5.0
+      ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: |
+        highmedorg_executeUpdateResources/0.5.0
+        highmedorg_downloadAllowList/0.5.0
+        highmedorg_localServicesIntegration/0.5.0
+        highmedorg_requestFeasibility/0.5.0
+        highmedorg_executeFeasibility/0.5.0
+        highmedorg_requestDataSharing/0.5.0
+        highmedorg_executeDataSharing/0.5.0
       # property org.highmed.dsf.bpe.allow.list.organization should only be set for testing, do not configure property in production, potential security risk
       ORG_HIGHMED_DSF_BPE_ALLOW_LIST_ORGANIZATION: Test_TTP
     networks:

diff --git a/dsf-docker-test-setup-3medic-ttp-docker/medic1/fhir/conf/bundle.xml b/dsf-docker-test-setup-3medic-ttp-docker/medic1/fhir/conf/bundle.xml
@@ -11,7 +11,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="ce880877ff656c2195c8577a707c532b04e5f3a40f9640cc5264018b213e35630b3747c73d80da408ceb0bffb65af2d4a0ba313d1f55ed439a56a7706501e056"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.ttp}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>

diff --git a/dsf-docker-test-setup-3medic-ttp-docker/medic2/fhir/conf/bundle.xml b/dsf-docker-test-setup-3medic-ttp-docker/medic2/fhir/conf/bundle.xml
@@ -11,7 +11,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="ce880877ff656c2195c8577a707c532b04e5f3a40f9640cc5264018b213e35630b3747c73d80da408ceb0bffb65af2d4a0ba313d1f55ed439a56a7706501e056"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.ttp}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>

diff --git a/dsf-docker-test-setup-3medic-ttp-docker/medic3/fhir/conf/bundle.xml b/dsf-docker-test-setup-3medic-ttp-docker/medic3/fhir/conf/bundle.xml
@@ -11,7 +11,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="ce880877ff656c2195c8577a707c532b04e5f3a40f9640cc5264018b213e35630b3747c73d80da408ceb0bffb65af2d4a0ba313d1f55ed439a56a7706501e056"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.ttp}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>

diff --git a/dsf-docker-test-setup-3medic-ttp-docker/ttp/fhir/conf/bundle.xml b/dsf-docker-test-setup-3medic-ttp-docker/ttp/fhir/conf/bundle.xml
@@ -43,7 +43,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="79b6cd18289dc6ff1019861e000de30587762505c8a561370a98f754f2941fcfbd67f55f0697d86b532bcbc3c40e4fe01e2073f8283f44b7f37b70abb05e5903"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.medic1}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>
@@ -74,7 +74,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="fee774c80225fd0eebf508170f68c2ae10ded9ca7a67d3802a26912bd9daed23c204a89ebb4aa2562bd36e00212dc8873fa274f36e37b94d0d76e2371df63e39"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.medic2}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>
@@ -105,7 +105,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="a48c359ba85843a66a9d78ff0fa3127ae79ce8e81bc520d6719bffde0ed4c3241e225a255b9b6f5c59a3ade5f08a9bbd1e1d4bf7d025d674fcc719d1d1fd89e0"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.medic3}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>

diff --git a/dsf-docker-test-setup-3medic-ttp/medic1/fhir/conf/bundle.xml b/dsf-docker-test-setup-3medic-ttp/medic1/fhir/conf/bundle.xml
@@ -11,7 +11,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="ce880877ff656c2195c8577a707c532b04e5f3a40f9640cc5264018b213e35630b3747c73d80da408ceb0bffb65af2d4a0ba313d1f55ed439a56a7706501e056"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.ttp}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>

diff --git a/dsf-docker-test-setup-3medic-ttp/medic1/fhir/docker-compose.yml b/dsf-docker-test-setup-3medic-ttp/medic1/fhir/docker-compose.yml
@@ -60,9 +60,10 @@ services:
       ORG_HIGHMED_DSF_FHIR_SERVER_BASE_URL: https://medic1/fhir
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_MeDIC_1
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_NAME: Test MeDIC 1
-      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${BUNDLE_USER_THUMBPRINT}
-      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${CONF_USER_THUMBPRINTS}
-      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${MEDIC1_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_TTP: ${TTP_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${MEDIC1_CONF_USER_THUMBPRINTS}
+      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${MEDIC1_CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
     networks:
       frontend:
         ipv4_address: 172.28.1.3

diff --git a/dsf-docker-test-setup-3medic-ttp/medic2/fhir/conf/bundle.xml b/dsf-docker-test-setup-3medic-ttp/medic2/fhir/conf/bundle.xml
@@ -11,7 +11,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="ce880877ff656c2195c8577a707c532b04e5f3a40f9640cc5264018b213e35630b3747c73d80da408ceb0bffb65af2d4a0ba313d1f55ed439a56a7706501e056"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.ttp}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>

diff --git a/dsf-docker-test-setup-3medic-ttp/medic2/fhir/docker-compose.yml b/dsf-docker-test-setup-3medic-ttp/medic2/fhir/docker-compose.yml
@@ -60,9 +60,10 @@ services:
       ORG_HIGHMED_DSF_FHIR_SERVER_BASE_URL: https://medic2/fhir
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_MeDIC_2
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_NAME: Test MeDIC 2
-      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${BUNDLE_USER_THUMBPRINT}
-      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${CONF_USER_THUMBPRINTS}
-      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${MEDIC2_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_TTP: ${TTP_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${MEDIC2_CONF_USER_THUMBPRINTS}
+      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${MEDIC2_CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
     networks:
       frontend:
         ipv4_address: 172.28.1.3

diff --git a/dsf-docker-test-setup-3medic-ttp/medic3/fhir/conf/bundle.xml b/dsf-docker-test-setup-3medic-ttp/medic3/fhir/conf/bundle.xml
@@ -11,7 +11,7 @@
                </tag>
             </meta>
             <extension url="http://highmed.org/fhir/StructureDefinition/extension-certificate-thumbprint">
-               <valueString value="ce880877ff656c2195c8577a707c532b04e5f3a40f9640cc5264018b213e35630b3747c73d80da408ceb0bffb65af2d4a0ba313d1f55ed439a56a7706501e056"/>
+               <valueString value="${org.highmed.dsf.fhir.server.organization.thumbprint.ttp}"/>
             </extension>
             <identifier>
                <system value="http://highmed.org/sid/organization-identifier"/>

diff --git a/dsf-docker-test-setup-3medic-ttp/medic3/fhir/docker-compose.yml b/dsf-docker-test-setup-3medic-ttp/medic3/fhir/docker-compose.yml
@@ -60,9 +60,10 @@ services:
       ORG_HIGHMED_DSF_FHIR_SERVER_BASE_URL: https://medic3/fhir
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_MeDIC_3
       ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_NAME: Test MeDIC 3
-      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${BUNDLE_USER_THUMBPRINT}
-      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${CONF_USER_THUMBPRINTS}
-      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT: ${MEDIC3_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_ORGANIZATION_THUMBPRINT_TTP: ${TTP_BUNDLE_USER_THUMBPRINT}
+      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS: ${MEDIC3_CONF_USER_THUMBPRINTS}
+      ORG_HIGHMED_DSF_FHIR_SERVER_USER_THUMBPRINTS_PERMANENT_DELETE: ${MEDIC3_CONF_USER_THUMBPRINTS_PERMANENT_DELETE}
     networks:
       frontend:
         ipv4_address: 172.28.1.3