diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ea32f16a..35e9e7c2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,28 +23,45 @@ jobs:
     
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
         
-      # Java and .NET are already installed on ubuntu-latest
+      # Install .NET runtime
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v2
+        with:
+          dotnet-version: 6.0.x
+      
+      # Install Java runtime (only needed if you want to run the offical HL7 Java validator)
+      - name: Setup Java JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'microsoft'
+          java-version: '17'
         
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.3.2
+        uses: FirelyTeam/firely-terminal-pipeline@v0.4.0
         with:
           PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
+          FIRELY_TERMINAL_VERSION: 3.1.0
           #PATH_TO_EXAMPLES: Examples
-          PATH_TO_QUALITY_CONTROL_RULES: qc/custom
+          #PATH_TO_QUALITY_CONTROL_RULES: qc/custom
           DOTNET_VALIDATION_ENABLED: true
           JAVA_VALIDATION_ENABLED: true
           OUTPUT_FORMAT: RAW
           JAVA_VALIDATION_OPTIONS: -allow-example-urls true
+          JAVA_VALIDATOR_VERSION: 6.0.11
           SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }}
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
+          SUSHI_VERSION: 3.5.0
           SUSHI_OPTIONS: Resources/
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
-      - name: Add & Commit
-        uses: EndBug/add-and-commit@v7
-        with:
-          add: 'Resources/fsh-generated/resources/'
+      - name: Check for Uncommitted Changes
+        run: |
+          git diff --exit-code 'Resources/fsh-generated/resources'|| (echo "Es gibt Änderungen durch die Pipeline. Lokale Sushi Konfiguration prüfen!" && exit 1)
+
+
diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-AvailabilityStatus.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-AvailabilityStatus.json
index 6d4a47f6..8439378a 100644
--- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-AvailabilityStatus.json
+++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-AvailabilityStatus.json
@@ -6,7 +6,6 @@
   "id": "GEM-ERP-CS-AvailabilityStatus",
   "title": "CodeSystem of AvailabilityStatus",
   "description": "Type of the availability status for medication availability request.",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus",
   "concept": [
     {
@@ -34,6 +33,7 @@
       "display": "unbekannt"
     }
   ],
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-DocumentType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-DocumentType.json
index 648cd683..ff7a7c40 100644
--- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-DocumentType.json
+++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-DocumentType.json
@@ -6,7 +6,6 @@
   "id": "GEM-ERP-CS-DocumentType",
   "title": "CodeSystem of Documenttypes",
   "description": "Type of document depending on the recipient of the Bundle.",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType",
   "concept": [
     {
@@ -22,6 +21,7 @@
       "display": "Receipt"
     }
   ],
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-FlowType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-FlowType.json
index 6daedb3b..155b79a3 100644
--- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-FlowType.json
+++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-FlowType.json
@@ -6,7 +6,6 @@
   "id": "GEM-ERP-CS-FlowType",
   "title": "CodeSystem of Flowtypes",
   "description": "Shows the different types of the ePrescription according to the prescription forms.",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType",
   "concept": [
     {
@@ -46,6 +45,7 @@
       "display": "reserviert für Pharmazeutische Dienstleistungen bzw. Impfungen durch Apotheker"
     }
   ],
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-OrganizationType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-OrganizationType.json
index 6f30d95c..f8342d25 100644
--- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-OrganizationType.json
+++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERP-CS-OrganizationType.json
@@ -6,7 +6,6 @@
   "id": "GEM-ERP-CS-OrganizationType",
   "title": "CodeSystem of Organizationtype Codes",
   "description": "Type of Organiziation where to get e-prescriptions dispensed",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType",
   "concept": [
     {
@@ -14,6 +13,7 @@
       "display": "Öffentliche Apotheke"
     }
   ],
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json b/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json
index 2f6ae213..431aa703 100644
--- a/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json
+++ b/Resources/fsh-generated/resources/Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json
@@ -6,6 +6,17 @@
       "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_BfArMApproval|1.2"
     ]
   },
+  "entity": [
+    {
+      "role": "source",
+      "what": {
+        "identifier": {
+          "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
+          "value": "165.100.000.000.024.67"
+        }
+      }
+    }
+  ],
   "agent": [
     {
       "type": {
@@ -27,17 +38,6 @@
       }
     }
   ],
-  "entity": [
-    {
-      "role": "source",
-      "what": {
-        "identifier": {
-          "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-          "value": "165.100.000.000.024.67"
-        }
-      }
-    }
-  ],
   "signature": [
     {
       "type": [
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json
index 27546847..2bea329b 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json
@@ -48,28 +48,28 @@
         "min": 3
       },
       {
-        "id": "Extension.extension:onPremise",
+        "id": "Extension.extension:delivery",
         "path": "Extension.extension",
-        "sliceName": "onPremise",
-        "short": "dispensation is offered/preferred on premise",
-        "definition": "Patient or pharmacy may state their preferred or offered supply option to pick up medications on Premise",
+        "sliceName": "delivery",
+        "short": "dispensation is offered/preferred by messenger",
+        "definition": "Patient or pharmacy may state their preferred or offered supply option to deliver medication by messenger",
         "min": 1,
         "max": "1"
       },
       {
-        "id": "Extension.extension:onPremise.extension",
+        "id": "Extension.extension:delivery.extension",
         "path": "Extension.extension.extension",
         "max": "0"
       },
       {
-        "id": "Extension.extension:onPremise.url",
+        "id": "Extension.extension:delivery.url",
         "path": "Extension.extension.url",
-        "fixedUri": "onPremise"
+        "fixedUri": "delivery"
       },
       {
-        "id": "Extension.extension:onPremise.value[x]",
+        "id": "Extension.extension:delivery.value[x]",
         "path": "Extension.extension.value[x]",
-        "short": "true = pick up on premise accepted/offered",
+        "short": "true = delivery by messenger accepted/offered",
         "type": [
           {
             "code": "boolean"
@@ -77,28 +77,28 @@
         ]
       },
       {
-        "id": "Extension.extension:delivery",
+        "id": "Extension.extension:onPremise",
         "path": "Extension.extension",
-        "sliceName": "delivery",
-        "short": "dispensation is offered/preferred by messenger",
-        "definition": "Patient or pharmacy may state their preferred or offered supply option to deliver medication by messenger",
+        "sliceName": "onPremise",
+        "short": "dispensation is offered/preferred on premise",
+        "definition": "Patient or pharmacy may state their preferred or offered supply option to pick up medications on Premise",
         "min": 1,
         "max": "1"
       },
       {
-        "id": "Extension.extension:delivery.extension",
+        "id": "Extension.extension:onPremise.extension",
         "path": "Extension.extension.extension",
         "max": "0"
       },
       {
-        "id": "Extension.extension:delivery.url",
+        "id": "Extension.extension:onPremise.url",
         "path": "Extension.extension.url",
-        "fixedUri": "delivery"
+        "fixedUri": "onPremise"
       },
       {
-        "id": "Extension.extension:delivery.value[x]",
+        "id": "Extension.extension:onPremise.value[x]",
         "path": "Extension.extension.value[x]",
-        "short": "true = delivery by messenger accepted/offered",
+        "short": "true = pick up on premise accepted/offered",
         "type": [
           {
             "code": "boolean"
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PAR-OUT-OP-Accept.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PAR-OUT-OP-Accept.json
index a64fdfae..35e782cd 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PAR-OUT-OP-Accept.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PAR-OUT-OP-Accept.json
@@ -1,12 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-PAR-OUT-OP-Accept",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Other"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PAR_OUT_OP_Accept",
   "version": "1.2",
   "name": "GEM_ERP_PAR_OUT_OP_Accept",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json
index cd9f4eef..2159b435 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-AuditEvent.json
@@ -4,16 +4,6 @@
   "meta": {
     "lastUpdated": "2020-04-16T13:41:55.87+00:00"
   },
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Security"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "not-classified"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_AuditEvent",
   "version": "1.2",
   "name": "GEM_ERP_PR_AuditEvent",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-BfArMApproval.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-BfArMApproval.json
index 50e96786..dda62124 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-BfArMApproval.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-BfArMApproval.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-PR-BfArMApproval",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Security"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "not-classified"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_BfArMApproval",
   "version": "1.2",
   "name": "GEM_ERP_PR_BfArMApproval",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Binary.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Binary.json
index 976daee6..e6c249b5 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Binary.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Binary.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-PR-Binary",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Other"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "not-classified"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Binary",
   "version": "1.2",
   "name": "GEM_ERP_PR_Binary",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Bundle.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Bundle.json
index 4222b089..0e4ba274 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Bundle.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Bundle.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-PR-Bundle",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Other"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "not-classified"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Bundle",
   "version": "1.2",
   "name": "GEM_ERP_PR_Bundle",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-CloseOperationInputBundle.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-CloseOperationInputBundle.json
index 1b34ec2d..774d11d9 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-CloseOperationInputBundle.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-CloseOperationInputBundle.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-PR-CloseOperationInputBundle",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Other"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "not-classified"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_CloseOperationInputBundle",
   "version": "1.2",
   "name": "GEM_ERP_PR_CloseOperationInputBundle",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json
index ef57b7ae..c1d4be1f 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json
@@ -4,16 +4,6 @@
   "meta": {
     "lastUpdated": "2020-04-16T13:43:30.128+00:00"
   },
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Clinical.Request & Response"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_DispReq",
   "version": "1.2",
   "name": "GEM_ERP_PR_Communication_DispReq",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json
index 377be1b0..4477309d 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json
@@ -4,16 +4,6 @@
   "meta": {
     "lastUpdated": "2020-04-16T13:43:30.128+00:00"
   },
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Clinical.Request & Response"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_InfoReq",
   "version": "1.2",
   "name": "GEM_ERP_PR_Communication_InfoReq",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json
index 526b0cf4..6782c728 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json
@@ -4,16 +4,6 @@
   "meta": {
     "lastUpdated": "2020-04-16T13:43:30.128+00:00"
   },
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Clinical.Request & Response"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_Reply",
   "version": "1.2",
   "name": "GEM_ERP_PR_Communication_Reply",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json
index 262e6cbb..9940f7a5 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json
@@ -4,16 +4,6 @@
   "meta": {
     "lastUpdated": "2020-04-16T13:43:30.128+00:00"
   },
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Clinical.Request & Response"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_Representative",
   "version": "1.2",
   "name": "GEM_ERP_PR_Communication_Representative",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json
index 4377236d..1f8131fc 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Composition.json
@@ -4,16 +4,6 @@
   "meta": {
     "lastUpdated": "2020-04-16T13:43:58.4+00:00"
   },
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Documents"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "not-classified"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Composition",
   "version": "1.2",
   "name": "GEM_ERP_PR_Composition",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Device.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Device.json
index afab9631..dd2d66c4 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Device.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Device.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-PR-Device",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Base.Entities"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "business"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Device",
   "version": "1.2",
   "name": "GEM_ERP_PR_Device",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Digest.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Digest.json
index 908d18a9..14cecc71 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Digest.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Digest.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-PR-Digest",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Other"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "not-classified"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Digest",
   "version": "1.2",
   "name": "GEM_ERP_PR_Digest",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json
index 045e0c2a..2e438b92 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json
@@ -4,16 +4,6 @@
   "meta": {
     "lastUpdated": "2020-04-16T13:44:27.957+00:00"
   },
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Clinical.Medications"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense",
   "version": "1.2",
   "name": "GEM_ERP_PR_MedicationDispense",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json
index 5d37b4dd..25630d9c 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Task.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERP-PR-Task",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Base.Workflow"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "not-classified"
-    }
-  ],
   "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Task",
   "version": "1.2",
   "name": "GEM_ERP_PR_Task",
diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-AvailabilityStatus.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-AvailabilityStatus.json
index 4bbfb56f..beac5ce4 100644
--- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-AvailabilityStatus.json
+++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-AvailabilityStatus.json
@@ -5,8 +5,8 @@
   "id": "GEM-ERP-VS-AvailabilityStatus",
   "title": "ValueSet of AvailabilityStatus Codes",
   "description": "Type of the availability status for medication availability request",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/ValueSet/GEM_ERP_VS_AvailabilityStatus",
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-DocumentType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-DocumentType.json
index b5986c63..a5d101c4 100644
--- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-DocumentType.json
+++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-DocumentType.json
@@ -5,8 +5,8 @@
   "id": "GEM-ERP-VS-DocumentType",
   "title": "ValueSet of Documenttype Codes",
   "description": "Type of document depending on the recipient.",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_VS_DocumentType",
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-FlowType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-FlowType.json
index 64961bee..3204de5d 100644
--- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-FlowType.json
+++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-FlowType.json
@@ -5,8 +5,8 @@
   "id": "GEM-ERP-VS-FlowType",
   "title": "ValueSet of Flowtype Codes",
   "description": "Shows the different types of the ePrescription according to the prescription forms.",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/ValueSet/GEM_ERP_VS_FlowType",
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-OrganizationType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-OrganizationType.json
index 0ef83e14..3226bf46 100644
--- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-OrganizationType.json
+++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-OrganizationType.json
@@ -5,8 +5,8 @@
   "id": "GEM-ERP-VS-OrganizationType",
   "title": "ValueSet of Organizationtype Codes",
   "description": "Type of Organiziation",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/ValueSet/GEM_ERP_VS_OrganizationType",
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-PerformerType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-PerformerType.json
index 007cf1a4..00159d9b 100644
--- a/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-PerformerType.json
+++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERP-VS-PerformerType.json
@@ -5,8 +5,8 @@
   "id": "GEM-ERP-VS-PerformerType",
   "title": "ValueSet of Performertype Codes",
   "description": "Type of performer",
-  "version": "1.2",
   "url": "https://gematik.de/fhir/erp/ValueSet/GEM_ERP_VS_PerformerType",
+  "version": "1.2",
   "publisher": "gematik GmbH",
   "contact": [
     {
diff --git a/Resources/input/fsh/extensions/GEM_ERP_EX_SupplyOptionsType.fsh b/Resources/input/fsh/extensions/GEM_ERP_EX_SupplyOptionsType.fsh
index ce464f75..c38d7697 100644
--- a/Resources/input/fsh/extensions/GEM_ERP_EX_SupplyOptionsType.fsh
+++ b/Resources/input/fsh/extensions/GEM_ERP_EX_SupplyOptionsType.fsh
@@ -11,8 +11,8 @@ Id: GEM-ERP-EX-SupplyOptionsType
 * extension ^slicing.discriminator.path = "url"
 * extension ^slicing.rules = #closed
 * extension contains
-    onPremise 1..1 and
     delivery 1..1 and
+    onPremise 1..1 and
     shipment 1..1
 * extension[onPremise] ^short = "dispensation is offered/preferred on premise"
 * extension[onPremise] ^definition = "Patient or pharmacy may state their preferred or offered supply option to pick up medications on Premise"
diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml
index 89ec4ac0..9abe5471 100644
--- a/Resources/sushi-config.yaml
+++ b/Resources/sushi-config.yaml
@@ -7,8 +7,7 @@ fhirVersion: 4.0.1
 FSHOnly: true
 applyExtensionMetadataToRoot: false
 
-status: draft
-version: "1.2.1"
+version: "1.2"
 publisher:
   name: Gematik GmbH
   url: https://www.gematik.de/
@@ -17,4 +16,4 @@ dependencies:
   de.basisprofil.r4: 1.3.2
   hl7.fhir.r4.core: 4.0.1
   kbv.ita.for: 1.1.0
-  kbv.ita.erp: 1.1.1
\ No newline at end of file
+  kbv.ita.erp: 1.1.x
\ No newline at end of file
diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json
index ed0fd170..170a44c2 100644
--- a/fhirpkg.lock.json
+++ b/fhirpkg.lock.json
@@ -1,7 +1,7 @@
 {
-  "updated": "2022-10-04T15:25:13.7837722+02:00",
+  "updated": "2023-11-28T08:57:44.285755+01:00",
   "dependencies": {
-    "kbv.ita.erp": "1.1.0",
+    "kbv.ita.erp": "1.1.2",
     "KBV.Basis": "1.3.0",
     "de.basisprofil.r4": "1.3.2",
     "hl7.fhir.r4.core": "4.0.1",
diff --git a/package.json b/package.json
index f683e188..55cb0fb9 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "description": "ePrescription workflow specification.\r\nRessources for ePrescription workflow major update 01.07.2023",
   "author": "gematik",
   "dependencies": {
-    "kbv.ita.erp": "1.1.1",
+    "kbv.ita.erp": "1.1.x",
     "kbv.ita.for": "1.1.0",
     "de.basisprofil.r4": "1.3.2",
     "hl7.fhir.r4.core": "4.0.1"