diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json
index 0977094..f1a2c89 100644
--- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json
+++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "CodeSystem",
-  "status": "draft",
+  "status": "active",
   "content": "complete",
   "name": "GEM_ERPCHRG_CS_ConsentType",
   "id": "GEM-ERPCHRG-CS-ConsentType",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json
index 609a1bb..171d4e5 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json
@@ -4,7 +4,9 @@
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_EX_MarkingFlag",
   "version": "1.0",
   "name": "GEM_ERPCHRG_EX_MarkingFlag",
-  "status": "draft",
+  "status": "active",
+  "experimental": false,
+  "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [
     {
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json
index 303d60a..2d33e58 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json
@@ -4,7 +4,7 @@
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_ChargeItem",
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_ChargeItem",
-  "status": "draft",
+  "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json
index ef00899..a02c96e 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json
@@ -5,7 +5,7 @@
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Communication_ChargChangeReply",
   "title": "Reply on change Request on ChargeItem from pharmacy to Patient",
-  "status": "draft",
+  "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
   "description": "Ressource used for the communication to reply to a change request on a ChargeItem",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json
index 707ee96..ce49b75 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json
@@ -5,7 +5,7 @@
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Communication_ChargChangeReq",
   "title": "Request for Modification on ChargeItem",
-  "status": "draft",
+  "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
   "description": "Ressource used for the communication of Change Request on an existing ChargeItem between patient and pharmacy",
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json
index 2eaffc1..835577d 100644
--- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json
+++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json
@@ -4,7 +4,7 @@
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_Consent",
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Consent",
-  "status": "draft",
+  "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json
index da48cf5..01c1922 100644
--- a/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json
+++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "ValueSet",
-  "status": "draft",
+  "status": "active",
   "name": "GEM_ERPCHRG_VS_ConsentType",
   "id": "GEM-ERPCHRG-VS-ConsentType",
   "title": "ValueSet of Consent Codes",
diff --git a/Resources/input/fsh/codesystems/GEM_ERPCHRG_CS_ConsentType.fsh b/Resources/input/fsh/codesystems/GEM_ERPCHRG_CS_ConsentType.fsh
index 582b1eb..7211151 100644
--- a/Resources/input/fsh/codesystems/GEM_ERPCHRG_CS_ConsentType.fsh
+++ b/Resources/input/fsh/codesystems/GEM_ERPCHRG_CS_ConsentType.fsh
@@ -2,13 +2,6 @@ CodeSystem: GEM_ERPCHRG_CS_ConsentType
 Id: GEM-ERPCHRG-CS-ConsentType
 Title: "CodeSystem of types for a consent"
 Description: "Type of patient consent."
-* ^url = "https://gematik.de/fhir/erpchrg/CodeSystem/GEM_ERPCHRG_CS_ConsentType"
-* ^version = "1.0"
-* ^status = #draft
-* ^publisher = "gematik GmbH"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.gematik.de"
-* ^copyright = "gematik GmbH"
-* ^caseSensitive = true
+* insert CodeSystem (GEM_ERPCHRG_CS_ConsentType)
 * ^content = #complete
 * #CHARGCONS "Consent for saving electronic charge item"
\ No newline at end of file
diff --git a/Resources/input/fsh/extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh b/Resources/input/fsh/extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh
index 2e82bc5..7adfe80 100644
--- a/Resources/input/fsh/extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh
+++ b/Resources/input/fsh/extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh
@@ -1,8 +1,6 @@
 Extension: GEM_ERPCHRG_EX_MarkingFlag
 Id: GEM-ERPCHRG-EX-MarkingFlag
-* ^url = $GEM_ERPCHRG_EX_MarkingFlag_URL
-* ^version = "1.0"
-* ^status = #draft
+* insert Meta (GEM_ERPCHRG_EX_MarkingFlag)
 * ^context.type = #element
 * ^context.expression = "ChargeItem"
 * . ^short = "Options for submitted ChargeItem"
diff --git a/Resources/input/fsh/rulesets.fsh b/Resources/input/fsh/rulesets.fsh
index cbd48f4..761607b 100644
--- a/Resources/input/fsh/rulesets.fsh
+++ b/Resources/input/fsh/rulesets.fsh
@@ -1,6 +1,6 @@
 // General rule for to handle versions for all structure definitions
 RuleSet: Versioning
-* ^status = #draft
+* ^status = #active
 * ^version = "1.0"
 
 RuleSet: Meta (profileName)
@@ -20,4 +20,20 @@ RuleSet: MetaProfile (profileName)
 RuleSet: Meta-Inst
 * insert Versioning
 * experimental = false
-* publisher = "gematik GmbH"
\ No newline at end of file
+* publisher = "gematik GmbH"
+
+RuleSet: CodeSystem(name)
+* ^url = "https://gematik.de/fhir/erpchrg/CodeSystem/{name}"
+* insert Versioning
+* ^publisher = "gematik GmbH"
+* ^contact.telecom.system = #url
+* ^contact.telecom.value = "http://www.gematik.de"
+* ^copyright = "gematik GmbH"
+* ^caseSensitive = true
+
+RuleSet: ValueSet(name)
+* ^url = "https://gematik.de/fhir/erpchrg/ValueSet/{name}"
+* insert Versioning
+* ^publisher = "gematik GmbH"
+* ^contact.telecom.system = #url
+* ^contact.telecom.value = "http://www.gematik.de"
\ No newline at end of file
diff --git a/Resources/input/fsh/valuesets/GEM_ERPCHRG_VS_ConsentType.fsh b/Resources/input/fsh/valuesets/GEM_ERPCHRG_VS_ConsentType.fsh
index 282598d..84a1290 100644
--- a/Resources/input/fsh/valuesets/GEM_ERPCHRG_VS_ConsentType.fsh
+++ b/Resources/input/fsh/valuesets/GEM_ERPCHRG_VS_ConsentType.fsh
@@ -2,10 +2,5 @@ ValueSet: GEM_ERPCHRG_VS_ConsentType
 Id: GEM-ERPCHRG-VS-ConsentType
 Title: "ValueSet of Consent Codes"
 Description: "Type of Consents for the ePrescription."
-* ^url = "https://gematik.de/fhir/erpchrg/ValueSet/GEM_ERPCHRG_VS_ConsentType"
-* ^version = "1.0"
-* ^status = #draft
-* ^publisher = "gematik GmbH"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.gematik.de"
+* insert ValueSet (GEM_ERPCHRG_VS_ConsentType)
 * include codes from system GEM_ERPCHRG_CS_ConsentType
\ No newline at end of file