diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 57bf663f..9fd3bd9c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,9 +6,7 @@ name: CI (FHIR Validation)
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master-isik-stufe-2 ]
   pull_request:
-    branches: [ master-isik-stufe-2 ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -42,7 +40,7 @@ jobs:
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
           SUSHI_OPTIONS: Resources/
-          SUSHI_VERSION: 2.10.2
+          SUSHI_VERSION: 3.5.0
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
       - name: Add & Commit
diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json
index 73de224e..a6299962 100644
--- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json
+++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json
@@ -2,9 +2,9 @@
   "resourceType": "CapabilityStatement",
   "id": "ISiKCapabilityStatementBasisServer",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/CapabilityStatement/basis-server",
+  "version": "2.0.6",
   "status": "active",
   "experimental": false,
-  "version": "2.0.5",
   "publisher": "gematik GmbH",
   "date": "2023-03-24",
   "implementationGuide": [
diff --git a/Resources/fsh-generated/resources/Encounter-Fachabteilungskontakt.json b/Resources/fsh-generated/resources/Encounter-Fachabteilungskontakt.json
index 83b879ad..e1f8fcc0 100644
--- a/Resources/fsh-generated/resources/Encounter-Fachabteilungskontakt.json
+++ b/Resources/fsh-generated/resources/Encounter-Fachabteilungskontakt.json
@@ -10,16 +10,16 @@
     {
       "coding": [
         {
-          "code": "operation",
-          "system": "http://fhir.de/CodeSystem/kontaktart-de"
+          "code": "abteilungskontakt",
+          "system": "http://fhir.de/CodeSystem/Kontaktebene"
         }
       ]
     },
     {
       "coding": [
         {
-          "code": "abteilungskontakt",
-          "system": "http://fhir.de/CodeSystem/Kontaktebene"
+          "system": "http://fhir.de/CodeSystem/kontaktart-de",
+          "code": "operation"
         }
       ]
     }
diff --git a/Resources/fsh-generated/resources/Patient-PatientinMusterfrau.json b/Resources/fsh-generated/resources/Patient-PatientinMusterfrau.json
index 607dab7e..768ddc4c 100644
--- a/Resources/fsh-generated/resources/Patient-PatientinMusterfrau.json
+++ b/Resources/fsh-generated/resources/Patient-PatientinMusterfrau.json
@@ -32,6 +32,7 @@
       "value": "A123456789"
     },
     {
+      "use": "secondary",
       "type": {
         "coding": [
           {
@@ -40,7 +41,6 @@
           }
         ]
       },
-      "use": "secondary",
       "value": "1234567890",
       "assigner": {
         "display": "Test PKV AG"
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json
index 654ce29f..c62b91c2 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKAbrechnungsfall",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKAbrechnungsfall",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKAbrechnungsfall",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die Gruppierung von medizinischen Leistungen in ISiK-Szenarien",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json
index 9d698ee1..99c82fdf 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKAngehoeriger",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKAngehoeriger",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKAngehoeriger",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json
index a5423013..fe37f19f 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json
@@ -2,12 +2,12 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKBerichtBundle",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBerichtBundle",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKBerichtBundle",
   "title": "ISiKBerichtBundle",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "A document style representation of the receipt (complete, self-contained, signed)",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json
index 690d8cbd..5575d685 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKBerichtSubSysteme",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBerichtSubSysteme",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKBerichtSubSysteme",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Krankenhaus-interne Übermittlung eines Berichtes in Form eines Dokumentes, die in ISiK Szenarien von Subsystemen an Primärsysteme gesendet werden.",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json
index f64dd192..d9318b1f 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json
@@ -2,12 +2,12 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKBinary",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBinary",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKBinary",
   "title": "ISiKBinary",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Die Binary-Ressource erlaubt den Umgang mit FHIR-fremden Formaten (z.B. PDFs, Bilder, CDA) innerhalb des FHIR-Frameworks.\r\nDazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) transportiert oder \r\nüber die REST-API am Binary-Endpunkt in ihrem nativen Format bereitgestellt. \r\nBinary-Ressourcen werden von Attachment-Elementen in DocumentReference-Ressourcen verlinkt und damit in den Kontext anderer FHIR-Ressourcen\r\n(z.B. Patient und Encounter) gestellt.  ",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json
index 8c5c9149..cd07a8a3 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKCodeSystem",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKCodeSystem",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKCodeSystem",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die maschinenlesbare Repräsentation von system-sepzifischen Kodierungen in ISiK-Szenarien",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json
index 5d67d2a9..87a055e7 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKDiagnose",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKDiagnose",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKDiagnose",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Nutzung von Diagnosen in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
@@ -275,8 +275,9 @@
         ]
       },
       {
-        "id": "Condition.onsetPeriod",
-        "path": "Condition.onsetPeriod",
+        "id": "Condition.onset[x]:onsetPeriod",
+        "path": "Condition.onset[x]",
+        "sliceName": "onsetPeriod",
         "min": 0,
         "max": "1",
         "type": [
@@ -286,8 +287,8 @@
         ]
       },
       {
-        "id": "Condition.onsetPeriod.start.extension:Lebensphase-Start",
-        "path": "Condition.onsetPeriod.start.extension",
+        "id": "Condition.onset[x]:onsetPeriod.start.extension:Lebensphase-Start",
+        "path": "Condition.onset[x].start.extension",
         "sliceName": "Lebensphase-Start",
         "min": 0,
         "max": "1",
@@ -301,8 +302,8 @@
         ]
       },
       {
-        "id": "Condition.onsetPeriod.end.extension:Lebensphase-Ende",
-        "path": "Condition.onsetPeriod.end.extension",
+        "id": "Condition.onset[x]:onsetPeriod.end.extension:Lebensphase-Ende",
+        "path": "Condition.onset[x].end.extension",
         "sliceName": "Lebensphase-Ende",
         "min": 0,
         "max": "1",
@@ -316,8 +317,9 @@
         ]
       },
       {
-        "id": "Condition.onsetDateTime",
-        "path": "Condition.onsetDateTime",
+        "id": "Condition.onset[x]:onsetDateTime",
+        "path": "Condition.onset[x]",
+        "sliceName": "onsetDateTime",
         "min": 0,
         "max": "1",
         "type": [
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json
index 125b6008..13f6b5ee 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKKontaktGesundheitseinrichtung",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKKontaktGesundheitseinrichtung",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKKontaktGesundheitseinrichtung",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Herstellung eines Fallbezuges welcher in der Mehrheit der ISiK Szenarien im Krankenhaus essentiell ist.",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json
index 4cdf9f28..bea3b530 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKPatient",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKPatient",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKPatient",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die Nutzung von administrativen Patientendaten in ISiK-Szenarien.",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json
index cf463793..3f5db055 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKPersonImGesundheitsberuf",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKPersonImGesundheitsberuf",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKPersonImGesundheitsberuf",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Nutzung von in Gesundheitsberufen tätigen Personen in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json
index 7a76aa6a..0ba2fb77 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKProzedur",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKProzedur",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKProzedur",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Diese Profil ermöglicht die Nutzung von Prozedur-bezogenen Informationen in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json
index 6d725346..70a83489 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKValueSet",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKValueSet",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKValueSet",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die maschinenlesbare Auswahl von Codes für die Kodierung spezifischer FHIR-Elemente in ISiK-Szenarien",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json
index c69001c5..50c7f874 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKVersicherungsverhaeltnisGesetzlich",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisGesetzlich",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKVersicherungsverhaeltnisGesetzlich",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Darstellung eines gesetzlichen Versicherungsverhältnisses in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json
index f1c78fb1..e7ba35bf 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKVersicherungsverhaeltnisSelbstzahler",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisSelbstzahler",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKVersicherungsverhaeltnisSelbstzahler",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht Selbstzahler Szenarien in ISiK.",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json
index 0132a2b2..94dc2fac 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "PlannedEndDate",
   "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedEndDate",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "PlannedEndDate",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [
diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json
index ca07571a..55a59c0e 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "PlannedStartDate",
   "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedStartDate",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "PlannedStartDate",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [
diff --git a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json
index dbc691ae..e0ee8b5a 100644
--- a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json
+++ b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json
@@ -4,11 +4,11 @@
   "name": "DiagnosesSCT",
   "id": "DiagnosesSCT",
   "description": "Enthaelt alle SNOMED Clinical finding, Event und Situation with explicit context codes",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/DiagnosesSCT",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {
diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json
index b0b85b23..7d6f9a36 100644
--- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json
+++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json
@@ -4,11 +4,11 @@
   "name": "ISiKAccountType",
   "id": "ISiKAccountType",
   "title": "ISiKAccountType",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ISiKAccountType",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {
diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json
index fd4cd562..55ac18f2 100644
--- a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json
+++ b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json
@@ -3,11 +3,11 @@
   "status": "active",
   "name": "ISiKLocationPhysicalType",
   "id": "ISiKLocationPhysicalType",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ISiKLocationPhysicalType",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {
diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json
index 928396b8..238ea6fb 100644
--- a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json
+++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json
@@ -4,11 +4,11 @@
   "name": "ProzedurenCodesSCT",
   "id": "ProzedurenCodesSCT",
   "description": "Enthaelt alle SNOMED Procedure Codes",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ProzedurenCodesSCT",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {
diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json
index dad3f7ca..9eccdcd5 100644
--- a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json
+++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json
@@ -4,11 +4,11 @@
   "name": "ProzedurenKategorieSCT",
   "id": "ProzedurenKategorieSCT",
   "description": "Enthaelt alle SNOMED Codes für ein Mapping der OPS Klassentitel",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ProzedurenKategorieSCT",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {
diff --git a/Resources/input/fsh/ISiKAbrechnungsfall.fsh b/Resources/input/fsh/ISiKAbrechnungsfall.fsh
index f8e618a8..34d4fde4 100644
--- a/Resources/input/fsh/ISiKAbrechnungsfall.fsh
+++ b/Resources/input/fsh/ISiKAbrechnungsfall.fsh
@@ -33,9 +33,9 @@ Description: "Dieses Profil beschreibt die Gruppierung von medizinischen Leistun
 Instance: AbrechnungsfallAmbulant
 InstanceOf: ISiKAbrechnungsfall
 Usage: #example
-* identifier.type = $v2-0203#VN
-* identifier.system = "https://test.krankenhaus.de/fhir/sid/besuchsnummer"
-* identifier.value = "0123456789"
+* identifier[Aufnahmenummer]
+  * system = "https://test.krankenhaus.de/fhir/sid/besuchsnummer"
+  * value = "0123456789"
 * status = #active
 * type = $v3-ActCode#AMB
 * subject = Reference(PatientinMusterfrau)
diff --git a/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh b/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh
index 995ebd41..9a2fdc30 100644
--- a/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh
+++ b/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh
@@ -145,8 +145,8 @@ Usage: #example
 * identifier.value = "0123456789"
 * status = #finished
 * class = $v3-ActCode#IMP
-* type[0] = $kontaktart-de#operation
-* type[+] = $Kontaktebene#abteilungskontakt
+* type[KontaktArt] = $kontaktart-de#operation
+* type[Kontaktebene] = $Kontaktebene#abteilungskontakt
 * serviceType = $FachabteilungsschluesselCS#0100
 * subject = Reference(PatientinMusterfrau)
 * period.start = "2021-02-12"
diff --git a/Resources/input/fsh/ISiKPatient.fsh b/Resources/input/fsh/ISiKPatient.fsh
index 2a4bfd4f..4f4304f2 100644
--- a/Resources/input/fsh/ISiKPatient.fsh
+++ b/Resources/input/fsh/ISiKPatient.fsh
@@ -121,22 +121,23 @@ Usage: #example
 * identifier[Versichertennummer_PKV].value = "1234567890"
 * identifier[Versichertennummer_PKV].assigner.display = "Test PKV AG"
 * active = true
-* name[0].use = #official
-* name[=].family = "Fürstin von Musterfrau"
-  * extension[0].url = "http://fhir.de/StructureDefinition/humanname-namenszusatz"
-  * extension[=].valueString = "Fürstin"
-  * extension[+].url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
-  * extension[=].valueString = "Musterfrau"
-  * extension[+].url = "http://hl7.org/fhir/StructureDefinition/humanname-own-prefix"
-  * extension[=].valueString = "von"
-* name[=].given = "Erika"
-* name[=].prefix = "Dr."
-  * extension.url = "http://hl7.org/fhir/StructureDefinition/iso21090-EN-qualifier"
-  * extension.valueCode = #AC
-* name[+].use = #maiden
-* name[=].family = "Gabler"
-  * extension.url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
-  * extension.valueString = "Gabler"
+* name[Name]
+  * family = "Fürstin von Musterfrau"
+    * extension[0].url = "http://fhir.de/StructureDefinition/humanname-namenszusatz"
+    * extension[=].valueString = "Fürstin"
+    * extension[+].url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
+    * extension[=].valueString = "Musterfrau"
+    * extension[+].url = "http://hl7.org/fhir/StructureDefinition/humanname-own-prefix"
+    * extension[=].valueString = "von"
+  * given = "Erika"
+  * prefix = "Dr."
+    * extension.url = "http://hl7.org/fhir/StructureDefinition/iso21090-EN-qualifier"
+    * extension.valueCode = #AC
+* name[Geburtsname]
+  * use = #maiden
+  * family = "Gabler"
+    * extension.url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
+    * extension.valueString = "Gabler"
 * gender = #female
 * birthDate = "1964-08-12"
 * address[0].type = #both
diff --git a/Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh b/Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh
index c2408fba..e59dc7eb 100644
--- a/Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh
+++ b/Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh
@@ -100,17 +100,18 @@ Usage: #example
 * identifier[=].system = "http://fhir.de/sid/bundesaerztekammer/efn"
 * identifier[=].value = "123456789123456"
 * active = true
-* name[0].use = #official
-* name[=].text = "Walter Arzt"
-* name[=].family = "Arzt"
-  * extension.url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
-  * extension.valueString = "Arzt"
-* name[=].given = "Walter"
-* name[+].use = #maiden
-* name[=].text = "Gross"
-* name[=].family = "Gross"
-  * extension.url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
-  * extension.valueString = "Gross"
+* name[Name]
+  * text = "Walter Arzt"
+  * family = "Arzt"
+    * extension.url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
+    * extension.valueString = "Arzt"
+  * given = "Walter"
+* name[Geburtsname]
+  * use = #maiden
+  * text = "Gross"
+  * family = "Gross"
+    * extension.url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
+    * extension.valueString = "Gross"
 * address.type = #both
 * address.line = "Schmiedegasse 16"
   * extension[0].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
diff --git a/Resources/input/fsh/ISiKVersicherungsverhaeltnisGesetzlich.fsh b/Resources/input/fsh/ISiKVersicherungsverhaeltnisGesetzlich.fsh
index 9e8c3887..9464ac59 100644
--- a/Resources/input/fsh/ISiKVersicherungsverhaeltnisGesetzlich.fsh
+++ b/Resources/input/fsh/ISiKVersicherungsverhaeltnisGesetzlich.fsh
@@ -54,9 +54,9 @@ Description: "Dieses Profil ermöglicht die Darstellung eines gesetzlichen Versi
 Instance: CoverageGesetzlich
 InstanceOf: ISiKVersicherungsverhaeltnisGesetzlich
 Usage: #example
-* identifier.type = $identifier-type-de-basis#GKV
-* identifier.system = "http://fhir.de/sid/gkv/kvid-10"
-* identifier.value = "A234567890"
+* identifier[KrankenversichertenID]
+  * system = "http://fhir.de/sid/gkv/kvid-10"
+  * value = "A234567890"
 * status = #active
 * type = $versicherungsart-de-basis#GKV
 * beneficiary = Reference(PatientinMusterfrau)
diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh
index 3477e182..505b4c81 100644
--- a/Resources/input/fsh/ruleset.fsh
+++ b/Resources/input/fsh/ruleset.fsh
@@ -1,13 +1,14 @@
 RuleSet: Meta
+* ^version = "2.0.6"
 * ^status = #active
 * ^experimental = false
 * ^publisher = "gematik GmbH"
-* ^date = "2023-03-24"
+* ^date = "2023-07-01"
 
 RuleSet: Meta-CapabilityStatement
+* version = "2.0.6"
 * status = #active
 * experimental = false
-* version = "2.0.5"
 * publisher = "gematik GmbH"
 * date = "2023-03-24"
 * implementationGuide = "https://gematik.de/fhir/isik/v2/Basismodul/ImplementationGuide|2.0.5"