diff --git a/.github/workflows/workers-ee.yaml b/.github/workflows/workers-ee.yaml
index a61d75160..18fca8872 100644
--- a/.github/workflows/workers-ee.yaml
+++ b/.github/workflows/workers-ee.yaml
@@ -47,7 +47,13 @@ jobs:
         #
         # Getting the images to build
         #
-        git diff --name-only HEAD HEAD~1 | grep backend/services | cut -d '/' -f3 | uniq > backend/images_to_build.txt
+        {
+          git diff --name-only HEAD HEAD~1 | grep -E "backend/cmd|backend/services" | grep -vE ^ee/ | cut -d '/' -f3
+        
+          git diff --name-only HEAD HEAD~1 | grep -E "backend/pkg|backend/internal" | grep -vE ^ee/ | cut -d '/' -f3 | uniq | while read -r pkg_name ; do
+            grep -rl "pkg/$pkg_name" backend/services backend/cmd | cut -d '/' -f3 
+          done
+        } | uniq > backend/images_to_build.txt
         [[ $(cat backend/images_to_build.txt) != "" ]] || (echo "Nothing to build here"; exit 0)
         #
         # Pushing image to registry
diff --git a/.github/workflows/workers.yaml b/.github/workflows/workers.yaml
index 7ce78ad6f..e6a91647d 100644
--- a/.github/workflows/workers.yaml
+++ b/.github/workflows/workers.yaml
@@ -51,8 +51,8 @@ jobs:
         {
           git diff --name-only HEAD HEAD~1 | grep -E "backend/cmd|backend/services" | grep -vE ^ee/ | cut -d '/' -f3
         
-          git diff --name-only HEAD HEAD~1 | grep backend/pkg | grep -vE ^ee/ | cut -d '/' -f3 | uniq | while read -r pkg_name ; do
-            grep -rl "pkg/$pkg_name" backend/services | cut -d '/' -f3 
+          git diff --name-only HEAD HEAD~1 | grep -E "backend/pkg|backend/internal" | grep -vE ^ee/ | cut -d '/' -f3 | uniq | while read -r pkg_name ; do
+            grep -rl "pkg/$pkg_name" backend/services backend/cmd | cut -d '/' -f3 
           done
         } | uniq > backend/images_to_build.txt