diff --git a/otterdog/eclipse-velocitas.jsonnet b/otterdog/eclipse-velocitas.jsonnet
index f49b0a6..7b176fd 100644
--- a/otterdog/eclipse-velocitas.jsonnet
+++ b/otterdog/eclipse-velocitas.jsonnet
@@ -23,12 +23,10 @@ orgs.newOrg('eclipse-velocitas') {
   _repositories+:: [
     orgs.newRepo('.github') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: ".github",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -43,12 +41,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('cli') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "Velocitas CLI",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -63,12 +59,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('devcontainer-base-images') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "devcontainer base images",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -83,12 +77,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('devenv-devcontainer-setup') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "devenv-devcontainer-setup",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -102,14 +94,10 @@ orgs.newOrg('eclipse-velocitas') {
       ],
     },
     orgs.newRepo('devenv-github-integration') {
-      allow_update_branch: false,
       archived: true,
-      delete_branch_on_merge: true,
-      description: "devenv-github-integration",
-      has_wiki: false,
+      secret_scanning_push_protection: "disabled",
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -124,12 +112,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('devenv-github-templates') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "devenv-github-templates",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -144,12 +130,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('devenv-github-workflows') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "devenv-github-workflows",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -163,14 +147,10 @@ orgs.newOrg('eclipse-velocitas') {
       ],
     },
     orgs.newRepo('devenv-runtime-k3d') {
-      allow_update_branch: false,
       archived: true,
-      delete_branch_on_merge: true,
-      description: "devenv-runtime-k3d",
-      has_wiki: false,
+      secret_scanning_push_protection: "disabled",
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -184,14 +164,10 @@ orgs.newOrg('eclipse-velocitas') {
       ],
     },
     orgs.newRepo('devenv-runtime-local') {
-      allow_update_branch: false,
       archived: true,
-      delete_branch_on_merge: true,
-      description: "devenv-runtime-local",
-      has_wiki: false,
+      secret_scanning_push_protection: "disabled",
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -206,12 +182,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('devenv-runtimes') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "devenv-runtimes",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -226,12 +200,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('license-check') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "license-check",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -244,14 +216,40 @@ orgs.newOrg('eclipse-velocitas') {
         },
       ],
     },
+    orgs.newRepo('pkg-velocitas-main') {
+      allow_update_branch: false,
+      has_wiki: false,
+      web_commit_signoff_required: false,
+      branch_protection_rules: [
+        orgs.newBranchProtectionRule('main') {
+          dismisses_stale_reviews: true,
+          require_last_push_approval: true,
+          required_approving_review_count: 1,
+          requires_conversation_resolution: true,
+          requires_strict_status_checks: true,
+        },
+      ],
+    },
+    orgs.newRepo('pkg-velocitas-uprotocol') {
+      allow_update_branch: false,
+      has_wiki: false,
+      web_commit_signoff_required: false,
+      branch_protection_rules: [
+        orgs.newBranchProtectionRule('main') {
+          dismisses_stale_reviews: true,
+          require_last_push_approval: true,
+          required_approving_review_count: 1,
+          requires_conversation_resolution: true,
+          requires_strict_status_checks: true,
+        },
+      ],
+    },
     orgs.newRepo('release-documentation-action') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "release-documentation-action",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -266,12 +264,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('vehicle-app-cpp-sdk') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "vehicle-app-cpp-sdk",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -286,13 +282,11 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('vehicle-app-cpp-template') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "vehicle-app-cpp-template",
       has_wiki: false,
       is_template: true,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -307,12 +301,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('vehicle-app-python-sdk') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "vehicle-app-python-sdk",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -327,13 +319,11 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('vehicle-app-python-template') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "vehicle-app-python-template",
       has_wiki: false,
       is_template: true,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -348,13 +338,11 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('vehicle-app-template') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "vehicle-app-template",
       has_wiki: false,
       is_template: true,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -369,12 +357,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('vehicle-model-cpp') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "vehicle-model-cpp",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -389,12 +375,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('vehicle-model-generator') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "vehicle-model-generator",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -409,12 +393,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('vehicle-model-python') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "vehicle-model-python",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -429,17 +411,14 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('velocitas-docs') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "Documentation artifacts of Velocitas",
       gh_pages_build_type: "legacy",
       gh_pages_source_branch: "docs",
       gh_pages_source_path: "/",
       has_discussions: true,
-      has_wiki: true,
       homepage: "https://eclipse.dev/velocitas",
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -462,12 +441,10 @@ orgs.newOrg('eclipse-velocitas') {
     },
     orgs.newRepo('velocitas-lib') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "A Python-based velocitas module which enables development of Velocitas CLI packages.",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -479,15 +456,16 @@ orgs.newOrg('eclipse-velocitas') {
           requires_strict_status_checks: true,
         },
       ],
+      environments: [
+        orgs.newEnvironment('pypi'),
+      ],
     },
     orgs.newRepo('velocitas-project-generator-npm') {
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       description: "velocitas-project-generator-npm",
       has_wiki: false,
       web_commit_signoff_required: false,
       workflows+: {
-        actions_can_approve_pull_request_reviews: false,
         default_workflow_permissions: "write",
       },
       branch_protection_rules: [
@@ -500,43 +478,5 @@ orgs.newOrg('eclipse-velocitas') {
         },
       ],
     },
-    orgs.newRepo('pkg-velocitas-main') {
-      allow_update_branch: false,
-      delete_branch_on_merge: true,
-      has_wiki: false,
-      web_commit_signoff_required: false,
-      workflows+: {
-        actions_can_approve_pull_request_reviews: false,
-        default_workflow_permissions: "read",
-      },
-      branch_protection_rules: [
-        orgs.newBranchProtectionRule('main') {
-          dismisses_stale_reviews: true,
-          require_last_push_approval: true,
-          required_approving_review_count: 1,
-          requires_conversation_resolution: true,
-          requires_strict_status_checks: true,
-        },
-      ],
-    },
-    orgs.newRepo('pkg-velocitas-uprotocol') {
-      allow_update_branch: false,
-      delete_branch_on_merge: true,
-      has_wiki: false,
-      web_commit_signoff_required: false,
-      workflows+: {
-        actions_can_approve_pull_request_reviews: false,
-        default_workflow_permissions: "read",
-      },
-      branch_protection_rules: [
-        orgs.newBranchProtectionRule('main') {
-          dismisses_stale_reviews: true,
-          require_last_push_approval: true,
-          required_approving_review_count: 1,
-          requires_conversation_resolution: true,
-          requires_strict_status_checks: true,
-        },
-      ],
-    },
   ],
 }