diff --git a/.github/workflows/build-agent-container.yml b/.github/workflows/build-agent-container.yml
index db45d0ce8..861128f0d 100644
--- a/.github/workflows/build-agent-container.yml
+++ b/.github/workflows/build-agent-container.yml
@@ -12,6 +12,7 @@ on:
     - shared/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-rust-containers.mk
     - Makefile
   pull_request:
     branches: [ main ]
@@ -24,6 +25,7 @@ on:
     - shared/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-rust-containers.mk
     - Makefile
   release:
     types:
diff --git a/.github/workflows/build-anomaly-detection-app-container.yml b/.github/workflows/build-anomaly-detection-app-container.yml
index 3a0afc5d2..130a1fa53 100644
--- a/.github/workflows/build-anomaly-detection-app-container.yml
+++ b/.github/workflows/build-anomaly-detection-app-container.yml
@@ -11,6 +11,7 @@ on:
     - samples/apps/anomaly-detection-app/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-python-containers.mk
     - Makefile
   pull_request:
     branches: [ main ]
@@ -22,6 +23,7 @@ on:
     - samples/apps/anomaly-detection-app/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-python-containers.mk
     - Makefile
   release:
     types:
diff --git a/.github/workflows/build-controller-container.yml b/.github/workflows/build-controller-container.yml
index 1330df84c..7f0dff2fd 100644
--- a/.github/workflows/build-controller-container.yml
+++ b/.github/workflows/build-controller-container.yml
@@ -12,6 +12,7 @@ on:
     - shared/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-rust-containers.mk
     - Makefile
   pull_request:
     branches: [ main ]
@@ -24,6 +25,7 @@ on:
     - shared/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-rust-containers.mk
     - Makefile
   release:
     types:
diff --git a/.github/workflows/build-onvif-video-broker-container.yml b/.github/workflows/build-onvif-video-broker-container.yml
index 0f69d1afd..e0653a50d 100644
--- a/.github/workflows/build-onvif-video-broker-container.yml
+++ b/.github/workflows/build-onvif-video-broker-container.yml
@@ -11,6 +11,7 @@ on:
     - samples/brokers/onvif-video-broker/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-dotnet-containers.mk
     - Makefile
   pull_request:
     branches: [ main ]
@@ -22,6 +23,7 @@ on:
     - samples/brokers/onvif-video-broker/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-dotnet-containers.mk
     - Makefile
   release:
     types:
diff --git a/.github/workflows/build-opcua-monitoring-broker-container.yml b/.github/workflows/build-opcua-monitoring-broker-container.yml
index ce2edbebf..cece7119f 100644
--- a/.github/workflows/build-opcua-monitoring-broker-container.yml
+++ b/.github/workflows/build-opcua-monitoring-broker-container.yml
@@ -11,6 +11,7 @@ on:
     - samples/brokers/opcua-monitoring-broker/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-dotnet-containers.mk
     - Makefile
   pull_request:
     branches: [ main ]
@@ -22,6 +23,7 @@ on:
     - samples/brokers/opcua-monitoring-broker/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-dotnet-containers.mk
     - Makefile
   release:
     types:
diff --git a/.github/workflows/build-udev-video-broker-container.yml b/.github/workflows/build-udev-video-broker-container.yml
index e2e29a932..fbaeff4c0 100644
--- a/.github/workflows/build-udev-video-broker-container.yml
+++ b/.github/workflows/build-udev-video-broker-container.yml
@@ -12,6 +12,7 @@ on:
     - shared/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-rust-containers.mk
     - Makefile
   pull_request:
     branches: [ main ]
@@ -24,6 +25,7 @@ on:
     - shared/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-rust-containers.mk
     - Makefile
   release:
     types:
diff --git a/.github/workflows/build-video-streaming-app-container.yml b/.github/workflows/build-video-streaming-app-container.yml
index a0d44872b..86c01c129 100644
--- a/.github/workflows/build-video-streaming-app-container.yml
+++ b/.github/workflows/build-video-streaming-app-container.yml
@@ -11,6 +11,7 @@ on:
     - samples/apps/video-streaming-app/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-python-containers.mk
     - Makefile
   pull_request:
     branches: [ main ]
@@ -22,6 +23,7 @@ on:
     - samples/apps/video-streaming-app/**
     - version.txt
     - build/akri-containers.mk
+    - build/akri-python-containers.mk
     - Makefile
   release:
     types:
diff --git a/.github/workflows/build-webhook-configuration-container.yml b/.github/workflows/build-webhook-configuration-container.yml
index 7013e9588..014f2194f 100644
--- a/.github/workflows/build-webhook-configuration-container.yml
+++ b/.github/workflows/build-webhook-configuration-container.yml
@@ -13,6 +13,7 @@ on:
       - webhooks/validating/configuration
       - version.txt
       - build/akri-containers.mk
+      - build/akri-rust-containers.mk
       - Makefile
   pull_request:
     branches: [main]
@@ -24,6 +25,7 @@ on:
       - webhooks/validating/configuration
       - version.txt
       - build/akri-containers.mk
+      - build/akri-rust-containers.mk
       - Makefile
   release:
     types: