diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9a6f02..870d2ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
   # This job build, test, package and deploy the artefact
   maven-build:
     # The tags on the runner
-    runs-on: [self-hosted, Linux]
+    runs-on: ebpro-org
 
     steps:
       #we get the content of the repository
@@ -46,7 +46,7 @@ jobs:
   # This job runs a sonarqube analysis on the hosted runner
   # only on develop branch
   maven-sonar:
-    runs-on: [self-hosted, Linux]
+    runs-on: ebpro-org
     needs: maven-build
     # Develop branch only
     if: github.ref == 'refs/heads/develop'
@@ -56,7 +56,7 @@ jobs:
 
   # This job publishes the site for develop branch
   maven-site:
-    runs-on: [self-hosted, Linux]
+    runs-on: ebpro-org
     needs: maven-sonar
     # Develop branch only
     if: github.ref == 'refs/heads/develop'
@@ -66,7 +66,7 @@ jobs:
 
   # This job deploys the artefacts
   maven-deploy:
-    runs-on: [ self-hosted, Linux ]
+    runs-on: ebpro-org
     needs: maven-sonar
     steps:
       - name: Deploy Maven Artifacts
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index ca79bbb..ac0c6df 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -3,7 +3,7 @@ on: [push]
 jobs:
   cleanup:
     # The tags on the runner
-    runs-on: [self-hosted, Linux]
+    runs-on: ebpro-org
     steps:
         - uses: smartsquaregmbh/delete-old-packages@v0.2.0
           with: