diff --git a/.github/workflows/tchap_create_release.yml b/.github/workflows/tchap_create_release.yml
index 774fd89e39..4c8fea3271 100644
--- a/.github/workflows/tchap_create_release.yml
+++ b/.github/workflows/tchap_create_release.yml
@@ -37,10 +37,6 @@ jobs:
               run: scripts/tchap/package-tchap.sh
               env:
                   CONFIG: prod
-            - name: Build the archive ${{ steps.version.outputs.version }} for prod rie
-              run: scripts/tchap/package-tchap.sh
-              env:
-                  CONFIG: prod_rie
             - name: Get current date
               id: date
               run: echo "::set-output name=date::$(date +'%Y%m%d')"
@@ -54,6 +50,5 @@ jobs:
                   artifacts: >
                       /home/runner/work/tchap-web-v4/tchap-web-v4/tchap-${{ steps.version.outputs.version }}-dev-${{ steps.date.outputs.date }}.tar.gz,
                       /home/runner/work/tchap-web-v4/tchap-web-v4/tchap-${{ steps.version.outputs.version }}-preprod-${{ steps.date.outputs.date }}.tar.gz,
-                      /home/runner/work/tchap-web-v4/tchap-web-v4/tchap-${{ steps.version.outputs.version }}-prod-${{ steps.date.outputs.date }}.tar.gz,
-                      /home/runner/work/tchap-web-v4/tchap-web-v4/tchap-${{ steps.version.outputs.version }}-prod_rie-${{ steps.date.outputs.date }}.tar.gz
+                      /home/runner/work/tchap-web-v4/tchap-web-v4/tchap-${{ steps.version.outputs.version }}-prod-${{ steps.date.outputs.date }}.tar.gz
                   token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/config.prod.json b/config.prod.json
index 7dc23812d1..d9c48e8957 100644
--- a/config.prod.json
+++ b/config.prod.json
@@ -197,7 +197,7 @@
         "feature_thread": ["agent.dinum.tchap.gouv.fr", "agent.finances.tchap.gouv.fr"],
         "feature_space": ["*"],
         "feature_audio_call": ["*"],
-        "feature_video_call": ["agent.dinum.tchap.gouv.fr"],
+        "feature_video_call": ["agent.dinum.tchap.gouv.fr", "agent.tchap.gouv.fr", "agent.education.tchap.gouv.fr"],
         "feature_video_group_call": [],
         "feature_screenshare_call": ["*"]
     },
diff --git a/config.prod.lab.json b/config.prod.lab.json
index dd7b54adb4..fb03a7d2f1 100644
--- a/config.prod.lab.json
+++ b/config.prod.lab.json
@@ -197,7 +197,7 @@
         "feature_thread": ["agent.dinum.tchap.gouv.fr", "agent.finances.tchap.gouv.fr"],
         "feature_space": ["agent.dinum.tchap.gouv.fr"],
         "feature_audio_call": ["*"],
-        "feature_video_call": ["agent.dinum.tchap.gouv.fr", "education.tchap.gouv.fr"],
+        "feature_video_call": ["agent.dinum.tchap.gouv.fr", "agent.tchap.gouv.fr", "agent.education.tchap.gouv.fr"],
         "feature_video_group_call": [],
         "feature_screenshare_call": ["*"]
     },
diff --git a/config.prod_rie.json b/config.prod_rie.json
deleted file mode 100644
index 9d96a23a96..0000000000
--- a/config.prod_rie.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "default_server_config": {
-        "m.homeserver": {
-            "base_url": "https://matrix.agent.tchap.rie.gouv.fr",
-            "server_name": "Agents"
-        },
-        "m.identity_server": {
-            "base_url": "https://matrix.agent.tchap.rie.gouv.fr"
-        }
-    },
-    "homeserver_list": [
-        {
-            "base_url": "https://matrix.agent.tchap.rie.gouv.fr",
-            "server_name": "Agents"
-        },
-        {
-            "base_url": "https://matrix.agent.agriculture.tchap.rie.gouv.fr",
-            "server_name": "Agriculture"
-        },
-        {
-            "base_url": "https://matrix.agent.collectivites.tchap.rie.gouv.fr",
-            "server_name": "Collectivites"
-        },
-        {
-            "base_url": "https://matrix.agent.culture.tchap.rie.gouv.fr",
-            "server_name": "Culture"
-        },
-        {
-            "base_url": "https://matrix.agent.dev-durable.tchap.rie.gouv.fr",
-            "server_name": "Développement durable"
-        },
-        {
-            "base_url": "https://matrix.agent.diplomatie.tchap.rie.gouv.fr",
-            "server_name": "Diplomatie"
-        },
-        {
-            "base_url": "https://matrix.agent.dinum.tchap.rie.gouv.fr",
-            "server_name": "DINUM"
-        },
-        {
-            "base_url": "https://matrix.agent.education.tchap.rie.gouv.fr",
-            "server_name": "Education"
-        },
-        {
-            "base_url": "https://matrix.agent.elysee.tchap.rie.gouv.fr",
-            "server_name": "Elysée"
-        },
-        {
-            "base_url": "https://matrix.agent.externe.tchap.rie.gouv.fr",
-            "server_name": "Externes"
-        },
-        {
-            "base_url": "https://matrix.agent.finances.tchap.rie.gouv.fr",
-            "server_name": "Finances"
-        },
-        {
-            "base_url": "https://matrix.agent.interieur.tchap.rie.gouv.fr",
-            "server_name": "Interieur"
-        },
-        {
-            "base_url": "https://matrix.agent.intradef.tchap.rie.gouv.fr",
-            "server_name": "Intradef"
-        },
-        {
-            "base_url": "https://matrix.agent.justice.tchap.rie.gouv.fr",
-            "server_name": "Justice"
-        },
-        {
-            "base_url": "https://matrix.agent.pm.tchap.rie.gouv.fr",
-            "server_name": "Premier Ministre"
-        },
-        {
-            "base_url": "https://matrix.agent.social.tchap.rie.gouv.fr",
-            "server_name": "Social"
-        },
-        {
-            "base_url": "https://matrix.agent.ssi.tchap.rie.gouv.fr",
-            "server_name": "SSI"
-        }
-    ],
-    "disable_custom_urls": false,
-    "disable_guests": true,
-    "disable_login_language_selector": false,
-    "disable_3pid_login": false,
-    "brand": "Tchap",
-    "bug_report_endpoint_url": "https://matrix.agent.dinum.tchap.rie.gouv.fr/bugreports/submit",
-    "uisi_autorageshake_app": "element-auto-uisi",
-    "default_country_code": "FR",
-    "show_labs_settings": false,
-    "features": {
-        "feature_video_rooms": false,
-        "feature_notification_settings2": false,
-        "feature_new_room_decoration_ui": true,
-        "feature_rust_crypto": true
-    },
-    "feedback": {
-        "existing_issues_url": "https://github.com/tchapgouv/tchap-web-v4/issues?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc",
-        "new_issue_url": "https://github.com/tchapgouv/tchap-web-v4/issues/new/choose"
-    },
-    "default_federate": true,
-    "default_theme": "light",
-    "room_directory": {
-        "servers": [
-            "agent.tchap.rie.gouv.fr",
-            "agent.agriculture.tchap.rie.gouv.fr",
-            "agent.collectivites.tchap.rie.gouv.fr",
-            "agent.culture.tchap.rie.gouv.fr",
-            "agent.dev-durable.tchap.rie.gouv.fr",
-            "agent.diplomatie.tchap.rie.gouv.fr",
-            "agent.dinum.tchap.rie.gouv.fr",
-            "agent.education.tchap.rie.gouv.fr",
-            "agent.elysee.tchap.rie.gouv.fr",
-            "agent.externe.tchap.rie.gouv.fr",
-            "agent.finances.tchap.rie.gouv.fr",
-            "agent.interieur.tchap.rie.gouv.fr",
-            "agent.intradef.tchap.rie.gouv.fr",
-            "agent.justice.tchap.rie.gouv.fr",
-            "agent.pm.tchap.rie.gouv.fr",
-            "agent.social.tchap.rie.gouv.fr",
-            "agent.ssi.tchap.rie.gouv.fr"
-        ]
-    },
-    "enable_presence_by_hs_url": {
-        "https://matrix.agent.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.agriculture.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.collectivites.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.culture.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.dev-durable.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.diplomatie.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.dinum.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.education.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.elysee.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.externe.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.finances.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.interieur.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.intradef.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.justice.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.pm.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.social.tchap.rie.gouv.fr": false,
-        "https://matrix.agent.ssi.tchap.rie.gouv.fr": false
-    },
-    "setting_defaults": {
-        "breadcrumbs": true,
-        "UIFeature.voip": true,
-        "UIFeature.shareSocial": false,
-        "UIFeature.registration": true,
-        "UIFeature.urlPreviews": false,
-        "UIFeature.widgets": false,
-        "UIFeature.shareQrCode": false,
-        "UIFeature.thirdPartyId": true,
-        "UIFeature.identityServer": true,
-        "UIFeature.advancedEncryption": false,
-        "UIFeature.locationSharing": true,
-        "MessageComposerInput.showPollsButton": true,
-        "RoomList.orderAlphabetically": false,
-        "Spaces.allRoomsInHome": true,
-        "layout": "bubble",
-        "custom_themes": [],
-        "FTUE.useCaseSelection": "WorkMessaging",
-        "RustCrypto.staged_rollout_percent": 100,
-        "hideDisplaynameChanges": true,
-        "hideAvatarChanges": true
-    },
-    "branding": {
-        "auth_header_logo_url": "themes/tchap/img/logos/tchap-logo.svg",
-        "auth_footer_links": [
-            { "text": "Gouvernement", "url": "https://www.gouvernement.fr" },
-            { "text": "OpenData", "url": "https://www.data.gouv.fr" },
-            { "text": "DINUM", "url": "https://numerique.gouv.fr" },
-            { "text": "beta.gouv.fr", "url": "https://beta.gouv.fr" },
-            { "text": "CGU", "url": "https://www.tchap.rie.gouv.fr/cgu" },
-            { "text": "FAQ", "url": "https://www.tchap.rie.gouv.fr/faq" }
-        ],
-        "welcome_background_url": "themes/tchap/img/backgrounds/tchap-bg.jpg"
-    },
-    "desktop_builds": {
-        "available": false
-    },
-    "mobile_builds": {
-        "ios": "https://apps.apple.com/us/app/tchap/id1446253779",
-        "android": "https://play.google.com/store/apps/details?id=fr.gouv.tchap.a",
-        "fdroid": null
-    },
-    "permalink_prefix": "https://tchap.rie.gouv.fr",
-    "terms_and_conditions_links": [
-        {
-            "url": "https://www.tchap.beta.gouv.fr/cgu",
-            "text": "Read the CGU"
-        },
-        {
-            "url": "https://tchap.beta.gouv.fr/politique-de-confidentialite",
-            "text": "Read the Privacy Policy"
-        }
-    ],
-    "tchap_features": {
-        "feature_email_notification": ["*"],
-        "feature_thread": ["agent.finances.tchap.rie.gouv.fr", "agent.dinum.tchap.rie.gouv.fr"],
-        "feature_space": ["*"],
-        "feature_audio_call": ["*"],
-        "feature_video_call": ["agent.dinum.tchap.rie.gouv.fr"],
-        "feature_screenshare_call": ["*"]
-    },
-    "map_style_url": "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
-}