diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb3bb05805..9811e31987 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -225,10 +225,6 @@ jobs:
           working_directory: ~/opencti/external-import/silobreaker
           name: Build Docker image opencti/connector-silobreaker
           command: docker build -t opencti/connector-silobreaker:latest . && docker tag opencti/connector-silobreaker:latest opencti/connector-silobreaker:${CIRCLE_TAG}
-      - run:
-          working_directory: ~/opencti/stream/sentinel
-          name: Build Docker image opencti/connector-sentinel
-          command: docker build -t opencti/connector-sentinel:latest . && docker tag opencti/connector-sentinel:latest opencti/connector-sentinel:${CIRCLE_TAG}
       - run:
           working_directory: ~/opencti/external-import/cybersixgill
           name: Build Docker image opencti/connector-cybersixgill
@@ -269,10 +265,6 @@ jobs:
           working_directory: ~/opencti/external-import/comlaude
           name: Build Docker image opencti/connector-comlaude
           command: docker build -t opencti/connector-comlaude:latest . && docker tag opencti/connector-comlaude:latest opencti/connector-comlaude:${CIRCLE_TAG}
-      - run:
-          working_directory: ~/opencti/stream/harfanglab
-          name: Build Docker image opencti/connector-harfanglab
-          command: docker build -t opencti/connector-harfanglab:latest . && docker tag opencti/connector-harfanglab:latest opencti/connector-harfanglab:${CIRCLE_TAG}
       - run:
           working_directory: ~/opencti/external-import/crtsh
           name: Build Docker image opencti/connector-crtsh
@@ -365,14 +357,6 @@ jobs:
           working_directory: ~/opencti/internal-enrichment/greynoise-vuln
           name: Build Docker image opencti/connector-greynoise-vuln
           command: docker build -t opencti/connector-greynoise-vuln:latest . && docker tag opencti/connector-greynoise-vuln:latest opencti/connector-greynoise-vuln:${CIRCLE_TAG}
-      - run:
-          working_directory: ~/opencti/external-import/sentinel-incidents
-          name: Build Docker image opencti/connector-sentinel-incidents
-          command: docker build -t opencti/connector-sentinel-incidents:latest . && docker tag opencti/connector-sentinel-incidents:latest opencti/connector-sentinel-incidents:${CIRCLE_TAG}
-      - run:
-          working_directory: ~/opencti/stream/sentinel-intel
-          name: Build Docker image opencti/connector-sentinel-intel
-          command: docker build -t opencti/connector-sentinel-intel:latest . && docker tag opencti/connector-sentinel-intel:latest opencti/connector-sentinel-intel:${CIRCLE_TAG}
       - run:
           working_directory: ~/opencti/external-import/tenable-vuln-management
           name: Build Docker image opencti/connector-tenable-vuln-management
@@ -461,8 +445,6 @@ jobs:
             docker push opencti/connector-eset:${CIRCLE_TAG}
             docker push opencti/connector-silobreaker:latest
             docker push opencti/connector-silobreaker:${CIRCLE_TAG}
-            docker push opencti/connector-sentinel:latest
-            docker push opencti/connector-sentinel:${CIRCLE_TAG}
             docker push opencti/connector-cybersixgill:latest
             docker push opencti/connector-cybersixgill:${CIRCLE_TAG}
             docker push opencti/connector-tweetfeed:latest
@@ -483,8 +465,6 @@ jobs:
             docker push opencti/connector-orion-malware:${CIRCLE_TAG}
             docker push opencti/connector-comlaude:latest
             docker push opencti/connector-comlaude:${CIRCLE_TAG}
-            docker push opencti/connector-harfanglab:latest
-            docker push opencti/connector-harfanglab:${CIRCLE_TAG}
             docker push opencti/connector-crtsh:latest
             docker push opencti/connector-crtsh:${CIRCLE_TAG}
             docker push opencti/connector-rst-report-hub:latest
@@ -531,10 +511,6 @@ jobs:
             docker push opencti/connector-shadowtrackr:${CIRCLE_TAG}
             docker push opencti/connector-greynoise-vuln:latest
             docker push opencti/connector-greynoise-vuln:${CIRCLE_TAG}
-            docker push opencti/connector-sentinel-incidents:latest
-            docker push opencti/connector-sentinel-incidents:${CIRCLE_TAG}
-            docker push opencti/connector-sentinel-intel:latest
-            docker push opencti/connector-sentinel-intel:${CIRCLE_TAG}
             docker push opencti/connector-tenable-vuln-management:latest 
             docker push opencti/connector-tenable-vuln-management:${CIRCLE_TAG}
 
@@ -560,10 +536,6 @@ jobs:
           working_directory: ~/opencti/internal-enrichment/hybrid-analysis-sandbox
           name: Build Docker image opencti/connector-hybrid-analysis-sandbox
           command: docker build -t opencti/connector-hybrid-analysis-sandbox:latest . && docker tag opencti/connector-hybrid-analysis-sandbox:latest opencti/connector-hybrid-analysis-sandbox:${CIRCLE_TAG}
-      - run:
-          working_directory: ~/opencti/stream/splunk
-          name: Build Docker image opencti/connector-splunk
-          command: docker build -t opencti/connector-splunk:latest . && docker tag opencti/connector-splunk:latest opencti/connector-splunk:${CIRCLE_TAG}
       - run:
           working_directory: ~/opencti/stream/elastic
           name: Build Docker image opencti/connector-elastic
@@ -732,10 +704,6 @@ jobs:
           working_directory: ~/opencti/internal-enrichment/google-dns
           name: Build Docker image opencti/connector-google-dns
           command: docker build -t opencti/connector-google-dns:latest . && docker tag opencti/connector-google-dns:latest opencti/connector-google-dns:${CIRCLE_TAG}
-      - run:
-          working_directory: ~/opencti/stream/qradar
-          name: Build Docker image opencti/connector-qradar
-          command: docker build -t opencti/connector-qradar:latest . && docker tag opencti/connector-qradar:latest opencti/connector-qradar:${CIRCLE_TAG}
       - run:
           working_directory: ~/opencti/stream/chronicle
           name: Build Docker image opencti/connector-chronicle
@@ -760,10 +728,6 @@ jobs:
           working_directory: ~/opencti/external-import/phishunt
           name: Build Docker image opencti/connector-phishunt
           command: docker build -t opencti/connector-phishunt:latest . && docker tag opencti/connector-phishunt:latest opencti/connector-phishunt:${CIRCLE_TAG}
-      - run:
-          working_directory: ~/opencti/internal-enrichment/attribution-tools
-          name: Build Docker image opencti/connector-attribution-tools
-          command: docker build -t opencti/connector-attribution-tools:latest . && docker tag opencti/connector-attribution-tools:latest opencti/connector-attribution-tools:${CIRCLE_TAG}
       - run:
           working_directory: ~/opencti/external-import/cluster25
           name: Build Docker image opencti/connector-cluster25
@@ -804,10 +768,6 @@ jobs:
           working_directory: ~/opencti/stream/jira
           name: Build Docker image opencti/connector-jira
           command: docker build -t opencti/connector-jira:latest . && docker tag opencti/connector-jira:latest opencti/connector-jira:${CIRCLE_TAG}
-      - run:
-          working_directory: ~/opencti/stream/webhook
-          name: Build Docker image opencti/connector-webhook
-          command: docker build -t opencti/connector-webhook:latest . && docker tag opencti/connector-webhook:latest opencti/connector-webhook:${CIRCLE_TAG}
       - run:
           working_directory: ~/opencti/internal-enrichment/reversinglabs-spectra-intel-submission
           name: Build Docker image opencti/connector-reversinglabs-spectra-intel-submission
@@ -832,8 +792,6 @@ jobs:
             docker push opencti/connector-sekoia:${CIRCLE_TAG}
             docker push opencti/connector-hybrid-analysis-sandbox:latest
             docker push opencti/connector-hybrid-analysis-sandbox:${CIRCLE_TAG}
-            docker push opencti/connector-splunk:latest
-            docker push opencti/connector-splunk:${CIRCLE_TAG}
             docker push opencti/connector-elastic:latest
             docker push opencti/connector-elastic:${CIRCLE_TAG}
             docker push opencti/connector-vxvault:latest
@@ -918,8 +876,6 @@ jobs:
             docker push opencti/connector-ipqs:${CIRCLE_TAG}
             docker push opencti/connector-google-dns:latest
             docker push opencti/connector-google-dns:${CIRCLE_TAG}
-            docker push opencti/connector-qradar:latest
-            docker push opencti/connector-qradar:${CIRCLE_TAG}
             docker push opencti/connector-chronicle:latest
             docker push opencti/connector-chronicle:${CIRCLE_TAG}
             docker push opencti/connector-zerofox:latest
@@ -932,8 +888,6 @@ jobs:
             docker push opencti/connector-stopforumspam:${CIRCLE_TAG}
             docker push opencti/connector-phishunt:latest
             docker push opencti/connector-phishunt:${CIRCLE_TAG}
-            docker push opencti/connector-attribution-tools:latest
-            docker push opencti/connector-attribution-tools:${CIRCLE_TAG}
             docker push opencti/connector-cluster25:latest
             docker push opencti/connector-cluster25:${CIRCLE_TAG}
             docker push opencti/connector-ransomwarelive:latest
@@ -954,8 +908,6 @@ jobs:
             docker push opencti/connector-reversinglabs-malware-presence:${CIRCLE_TAG}
             docker push opencti/connector-jira:latest
             docker push opencti/connector-jira:${CIRCLE_TAG}
-            docker push opencti/connector-webhook:latest
-            docker push opencti/connector-webhook:${CIRCLE_TAG}
             docker push opencti/connector-reversinglabs-spectra-intel-submission:latest
             docker push opencti/connector-reversinglabs-spectra-intel-submission:${CIRCLE_TAG}
             docker push opencti/connector-import-file-misp:latest
@@ -970,6 +922,66 @@ jobs:
       - ms-teams/report:
           only_on_fail: true
           webhook_url: $MS_TEAMS_WEBHOOK_URL
+  build_3:
+    working_directory: ~/opencti
+    docker:
+      - image: cimg/base:stable-20.04
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: sudo apt-get update -qq && sudo apt install curl gettext-base
+      - run:
+          working_directory: ~/opencti/external-import/sentinel-incidents
+          name: Build Docker image opencti/connector-sentinel-incidents
+          command: docker build -t opencti/connector-sentinel-incidents:latest . && docker tag opencti/connector-sentinel-incidents:latest opencti/connector-sentinel-incidents:${CIRCLE_TAG}
+      - run:
+          working_directory: ~/opencti/stream/sentinel-intel
+          name: Build Docker image opencti/connector-sentinel-intel
+          command: docker build -t opencti/connector-sentinel-intel:latest . && docker tag opencti/connector-sentinel-intel:latest opencti/connector-sentinel-intel:${CIRCLE_TAG}
+      - run:
+          working_directory: ~/opencti/stream/sentinel
+          name: Build Docker image opencti/connector-sentinel
+          command: docker build -t opencti/connector-sentinel:latest . && docker tag opencti/connector-sentinel:latest opencti/connector-sentinel:${CIRCLE_TAG}
+      - run:
+          working_directory: ~/opencti/stream/harfanglab
+          name: Build Docker image opencti/connector-harfanglab
+          command: docker build -t opencti/connector-harfanglab:latest . && docker tag opencti/connector-harfanglab:latest opencti/connector-harfanglab:${CIRCLE_TAG}
+      - run:
+          working_directory: ~/opencti/stream/webhook
+          name: Build Docker image opencti/connector-webhook
+          command: docker build -t opencti/connector-webhook:latest . && docker tag opencti/connector-webhook:latest opencti/connector-webhook:${CIRCLE_TAG}
+      - run:
+          working_directory: ~/opencti/internal-enrichment/attribution-tools
+          name: Build Docker image opencti/connector-attribution-tools
+          command: docker build -t opencti/connector-attribution-tools:latest . && docker tag opencti/connector-attribution-tools:latest opencti/connector-attribution-tools:${CIRCLE_TAG}
+      - run:
+          working_directory: ~/opencti/stream/qradar
+          name: Build Docker image opencti/connector-qradar
+          command: docker build -t opencti/connector-qradar:latest . && docker tag opencti/connector-qradar:latest opencti/connector-qradar:${CIRCLE_TAG}
+      - run:
+          working_directory: ~/opencti/stream/splunk
+          name: Build Docker image opencti/connector-splunk
+          command: docker build -t opencti/connector-splunk:latest . && docker tag opencti/connector-splunk:latest opencti/connector-splunk:${CIRCLE_TAG}
+      - run:
+          name: Publish Docker Image to Docker Hub
+          command: |
+            echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+            docker push opencti/connector-sentinel-incidents:latest
+            docker push opencti/connector-sentinel-incidents:${CIRCLE_TAG}
+            docker push opencti/connector-sentinel-intel:latest
+            docker push opencti/connector-sentinel-intel:${CIRCLE_TAG}
+            docker push opencti/connector-sentinel:latest
+            docker push opencti/connector-sentinel:${CIRCLE_TAG}
+            docker push opencti/connector-harfanglab:latest
+            docker push opencti/connector-harfanglab:${CIRCLE_TAG}
+            docker push opencti/connector-webhook:latest
+            docker push opencti/connector-webhook:${CIRCLE_TAG}
+            docker push opencti/connector-attribution-tools:latest
+            docker push opencti/connector-attribution-tools:${CIRCLE_TAG}
+            docker push opencti/connector-qradar:latest
+            docker push opencti/connector-qradar:${CIRCLE_TAG}
+            docker push opencti/connector-splunk:latest
+            docker push opencti/connector-splunk:${CIRCLE_TAG}
   build_fips_1:
     working_directory: ~/opencti
     docker:
@@ -1182,10 +1194,6 @@ jobs:
           working_directory: ~/opencti/external-import/silobreaker
           name: Build Docker image opencti/connector-silobreaker
           command: docker build -t opencti/connector-silobreaker:rolling .
-      - run:
-          working_directory: ~/opencti/stream/sentinel
-          name: Build Docker image opencti/connector-sentinel
-          command: docker build -t opencti/connector-sentinel:rolling .
       - run:
           working_directory: ~/opencti/external-import/cybersixgill
           name: Build Docker image opencti/connector-cybersixgill
@@ -1226,10 +1234,6 @@ jobs:
           working_directory: ~/opencti/external-import/comlaude
           name: Build Docker image opencti/connector-comlaude
           command: docker build -t opencti/connector-comlaude:rolling .
-      - run:
-          working_directory: ~/opencti/stream/harfanglab
-          name: Build Docker image opencti/connector-harfanglab
-          command: docker build -t opencti/connector-harfanglab:rolling .
       - run:
           working_directory: ~/opencti/external-import/crtsh
           name: Build Docker image opencti/connector-crtsh
@@ -1322,14 +1326,6 @@ jobs:
           working_directory: ~/opencti/internal-enrichment/greynoise-vuln
           name: Build Docker image opencti/connector-greynoise-vuln
           command: docker build -t opencti/connector-greynoise-vuln:rolling .
-      - run:
-          working_directory: ~/opencti/external-import/sentinel-incidents
-          name: Build Docker image opencti/connector-sentinel-incidents
-          command: docker build -t opencti/connector-sentinel-incidents:rolling .
-      - run:
-          working_directory: ~/opencti/stream/sentinel-intel
-          name: Build Docker image opencti/connector-sentinel-intel
-          command: docker build -t opencti/connector-sentinel-intel:rolling .
       - run:
           working_directory: ~/opencti/external-import/tenable-vuln-management
           name: Build Docker image opencti/connector-tenable-vuln-management
@@ -1376,7 +1372,6 @@ jobs:
             docker push opencti/connector-tagger:rolling
             docker push opencti/connector-eset:rolling
             docker push opencti/connector-silobreaker:rolling
-            docker push opencti/connector-sentinel:rolling
             docker push opencti/connector-cybersixgill:rolling
             docker push opencti/connector-tweetfeed:rolling
             docker push opencti/connector-threatfox:rolling
@@ -1387,7 +1382,6 @@ jobs:
             docker push opencti/connector-logrhythm:rolling
             docker push opencti/connector-orion-malware:rolling
             docker push opencti/connector-comlaude:rolling
-            docker push opencti/connector-harfanglab:rolling
             docker push opencti/connector-crtsh:rolling
             docker push opencti/connector-rst-report-hub:rolling
             docker push opencti/connector-rst-threat-feed:rolling
@@ -1411,8 +1405,6 @@ jobs:
             docker push opencti/connector-reversinglabs-spectra-analyze:rolling
             docker push opencti/connector-shadowtrackr:rolling
             docker push opencti/connector-greynoise-vuln:rolling
-            docker push opencti/connector-sentinel-incidents:rolling
-            docker push opencti/connector-sentinel-intel:rolling
             docker push opencti/connector-tenable-vuln-management:rolling
       - slack/notify:
           event: fail
@@ -1440,10 +1432,6 @@ jobs:
           working_directory: ~/opencti/internal-enrichment/hybrid-analysis-sandbox
           name: Build Docker image opencti/connector-hybrid-analysis-sandbox
           command: docker build -t opencti/connector-hybrid-analysis-sandbox:rolling .
-      - run:
-          working_directory: ~/opencti/stream/splunk
-          name: Build Docker image opencti/connector-splunk
-          command: docker build -t opencti/connector-splunk:rolling .
       - run:
           working_directory: ~/opencti/stream/elastic
           name: Build Docker image opencti/connector-elastic
@@ -1616,10 +1604,6 @@ jobs:
           working_directory: ~/opencti/internal-enrichment/google-dns
           name: Build Docker image opencti/connector-google-dns
           command: docker build -t opencti/connector-google-dns:rolling .
-      - run:
-          working_directory: ~/opencti/stream/qradar
-          name: Build Docker image opencti/connector-qradar
-          command: docker build -t opencti/connector-qradar:rolling .
       - run:
           working_directory: ~/opencti/stream/chronicle
           name: Build Docker image opencti/connector-chronicle
@@ -1644,10 +1628,6 @@ jobs:
           working_directory: ~/opencti/external-import/phishunt
           name: Build Docker image opencti/connector-phishunt
           command: docker build -t opencti/connector-phishunt:rolling .
-      - run:
-          working_directory: ~/opencti/internal-enrichment/attribution-tools
-          name: Build Docker image opencti/connector-attribution-tools
-          command: docker build -t opencti/connector-attribution-tools:rolling .
       - run:
           working_directory: ~/opencti/external-import/cluster25
           name: Build Docker image opencti/connector-cluster25
@@ -1688,10 +1668,6 @@ jobs:
           working_directory: ~/opencti/stream/jira
           name: Build Docker image opencti/connector-jira
           command: docker build -t opencti/connector-jira:rolling .
-      - run:
-          working_directory: ~/opencti/stream/webhook
-          name: Build Docker image opencti/connector-webhook
-          command: docker build -t opencti/connector-webhook:rolling .
       - run:
           working_directory: ~/opencti/internal-enrichment/reversinglabs-spectra-intel-submission
           name: Build Docker image opencti/connector-reversinglabs-spectra-intel-submission
@@ -1714,7 +1690,6 @@ jobs:
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             docker push opencti/connector-sekoia:rolling
             docker push opencti/connector-hybrid-analysis-sandbox:rolling
-            docker push opencti/connector-splunk:rolling
             docker push opencti/connector-elastic:rolling
             docker push opencti/connector-vxvault:rolling
             docker push opencti/connector-shodan:rolling
@@ -1758,14 +1733,12 @@ jobs:
             docker push opencti/connector-yara:rolling
             docker push opencti/connector-ipqs:rolling
             docker push opencti/connector-google-dns:rolling
-            docker push opencti/connector-qradar:rolling
             docker push opencti/connector-chronicle:rolling
             docker push opencti/connector-zerofox:rolling
             docker push opencti/connector-recordedfuture-enrichment:rolling
             docker push opencti/connector-lastinfosec-enrichment:rolling
             docker push opencti/connector-stopforumspam:rolling
             docker push opencti/connector-phishunt:rolling
-            docker push opencti/connector-attribution-tools:rolling
             docker push opencti/connector-cluster25:rolling
             docker push opencti/connector-ransomwarelive:rolling
             docker push opencti/connector-anyrun-feed:rolling
@@ -1776,7 +1749,6 @@ jobs:
             docker push opencti/connector-shadowserver:rolling
             docker push opencti/connector-reversinglabs-malware-presence:rolling
             docker push opencti/connector-jira:rolling
-            docker push opencti/connector-webhook:rolling
             docker push opencti/connector-reversinglabs-spectra-intel-submission:rolling
             docker push opencti/connector-import-file-misp:rolling
             docker push opencti/connector-tanium-incidents:rolling
@@ -1787,6 +1759,63 @@ jobs:
       - ms-teams/report:
           only_on_fail: true
           webhook_url: $MS_TEAMS_WEBHOOK_URL
+  build_rolling_3:
+    working_directory: ~/opencti
+    docker:
+      - image: cimg/base:stable-20.04
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: sudo apt-get update -qq && sudo apt install curl gettext-base
+      - run:
+          working_directory: ~/opencti
+          name: Replace pycti requirement of stable version with latest master branch code
+          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@master|' -i {} \;
+      - run:
+          working_directory: ~/opencti/stream/sentinel
+          name: Build Docker image opencti/connector-sentinel
+          command: docker build -t opencti/connector-sentinel:rolling .
+      - run:
+          working_directory: ~/opencti/external-import/sentinel-incidents
+          name: Build Docker image opencti/connector-sentinel-incidents
+          command: docker build -t opencti/connector-sentinel-incidents:rolling .
+      - run:
+          working_directory: ~/opencti/stream/sentinel-intel
+          name: Build Docker image opencti/connector-sentinel-intel
+          command: docker build -t opencti/connector-sentinel-intel:rolling .
+      - run:
+          working_directory: ~/opencti/stream/harfanglab
+          name: Build Docker image opencti/connector-harfanglab
+          command: docker build -t opencti/connector-harfanglab:rolling .
+      - run:
+          working_directory: ~/opencti/stream/webhook
+          name: Build Docker image opencti/connector-webhook
+          command: docker build -t opencti/connector-webhook:rolling .
+      - run:
+          working_directory: ~/opencti/internal-enrichment/attribution-tools
+          name: Build Docker image opencti/connector-attribution-tools
+          command: docker build -t opencti/connector-attribution-tools:rolling .
+      - run:
+          working_directory: ~/opencti/stream/qradar
+          name: Build Docker image opencti/connector-qradar
+          command: docker build -t opencti/connector-qradar:rolling .
+      - run:
+          working_directory: ~/opencti/stream/splunk
+          name: Build Docker image opencti/connector-splunk
+          command: docker build -t opencti/connector-splunk:rolling .
+      - run:
+          name: Publish Docker Image to Docker Hub
+          command: |
+            echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+            docker push opencti/connector-sentinel:rolling
+            docker push opencti/connector-sentinel-incidents:rolling
+            docker push opencti/connector-sentinel-intel:rolling
+            docker push opencti/connector-harfanglab:rolling
+            docker push opencti/connector-webhook:rolling
+            docker push opencti/connector-attribution-tools:rolling
+            docker push opencti/connector-qradar:rolling
+            docker push opencti/connector-splunk:rolling
+
   build_fips_rolling_1:
     working_directory: ~/opencti
     docker:
@@ -1875,6 +1904,12 @@ workflows:
               only: /[0-9]+(\.[0-9]+)+(\.[0-9]+)*/
             branches:
               ignore: /.*/
+      - build_3:
+          filters:
+            tags:
+              only: /[0-9]+(\.[0-9]+)+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/
       - build_fips_1:
           filters:
             tags:
@@ -1897,6 +1932,14 @@ workflows:
             branches:
               only:
                 - master
+      - build_rolling_3:
+          requires:
+            - ensure_formatting
+            - linter
+          filters:
+            branches:
+              only:
+                - master
       - build_fips_rolling_1:
           requires:
             - ensure_formatting
@@ -1909,11 +1952,13 @@ workflows:
           requires:
             - build_rolling_1
             - build_rolling_2
+            - build_rolling_3
             - build_fips_rolling_1
       - notify:
           requires:
             - build_1
             - build_2
+            - build_3
             - build_fips_1
           filters:
             tags:
diff --git a/internal-enrichment/attribution-tools/Dockerfile b/internal-enrichment/attribution-tools/Dockerfile
index bb9bf85003..3a49493229 100644
--- a/internal-enrichment/attribution-tools/Dockerfile
+++ b/internal-enrichment/attribution-tools/Dockerfile
@@ -6,7 +6,7 @@ COPY src /opt/opencti-connector-attribution-tools
 
 # Install dependencies
 RUN apk update && apk upgrade && \
-    apk --no-cache add libmagic-dev git build-base
+    apk --no-cache add gcc git build-base libmagic libffi-dev
 
 # Install Python modules
 RUN cd /opt/opencti-connector-attribution-tools && \
diff --git a/internal-enrichment/import-external-reference/Dockerfile b/internal-enrichment/import-external-reference/Dockerfile
index f6bb6843fc..3423b9c396 100644
--- a/internal-enrichment/import-external-reference/Dockerfile
+++ b/internal-enrichment/import-external-reference/Dockerfile
@@ -1,4 +1,6 @@
-FROM python:3.12-alpine
+FROM python:3.12-bookworm
+# Browser builds for Firefox and WebKit are built for the glibc library. Alpine Linux and other distributions that are based on the musl standard library are not supported.
+# https://playwright.dev/python/docs/docker#alpine
 ENV CONNECTOR_TYPE=INTERNAL_ENRICHMENT
 
 # Copy the connector
@@ -6,12 +8,11 @@ COPY src /opt/opencti-connector-import-external-reference
 
 # Install Python modules
 # hadolint ignore=DL3003
-RUN apk update && apk upgrade && \
-    apk --no-cache add git build-base libmagic-dev libffi-dev libxml2-dev libxslt-dev libssl-dev cargo libjpeg-dev zlib1g-dev libxkbcommon0 libgbm1 libnss3 libnspr4 libdbus-1-3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libatspi2.0-0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libasound2 && \
+RUN apt-get update && \
+    apt-get install -y git build-essential libmagic-dev libffi-dev libxml2-dev libxslt-dev libssl-dev cargo libjpeg-dev zlib1g-dev libxkbcommon0 libgbm1 libnss3 libnspr4 libdbus-1-3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libatspi2.0-0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libasound2 && \
     cd /opt/opencti-connector-import-external-reference && \
     pip3 install --no-cache-dir -r requirements.txt && \
-    playwright install && \
-    apk del git build-base
+    playwright install
 
 # Expose and entrypoint
 COPY entrypoint.sh /
diff --git a/internal-enrichment/yara/Dockerfile b/internal-enrichment/yara/Dockerfile
index 395bc68173..1c8df9e314 100644
--- a/internal-enrichment/yara/Dockerfile
+++ b/internal-enrichment/yara/Dockerfile
@@ -7,8 +7,7 @@ COPY src /opt/opencti-yara
 # Install Python modules
 # hadolint ignore=DL3003
 RUN apk update && apk upgrade && \
-    apk --no-cache add gcc git build-base libmagic1 libffi-dev libxml2-dev libxslt-dev libssl-dev yara && \
-    apt-get clean
+    apk --no-cache add gcc git build-base libmagic libffi-dev yara
 
 RUN pip3 install --no-cache-dir -r /opt/opencti-yara/requirements.txt && \
     apk del git build-base