diff --git a/.github/workflows/build-opcua-monitoring-broker-container.yml b/.github/workflows/build-opcua-monitoring-broker-container.yml
index a087f6257..6a234084e 100644
--- a/.github/workflows/build-opcua-monitoring-broker-container.yml
+++ b/.github/workflows/build-opcua-monitoring-broker-container.yml
@@ -59,9 +59,9 @@ jobs:
           org.opencontainers.image.description="Akri sample OPC UA monitoring broker"
         tags: |
           type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=raw,value=${{steps.version-string.outputs.version}},enable=${{github.event_name != 'release'}}
+          type=semver,pattern=v{{version}}
+          type=semver,pattern=v{{major}}.{{minor}}
+          type=raw,value=v${{steps.version-string.outputs.version}}-dev,enable=${{github.event_name != 'release'}}
 
     - name: Build and push
       uses: docker/build-push-action@v5
diff --git a/.github/workflows/build-python-app-containers.yml b/.github/workflows/build-python-app-containers.yml
index 545e305d9..f9038102d 100644
--- a/.github/workflows/build-python-app-containers.yml
+++ b/.github/workflows/build-python-app-containers.yml
@@ -64,9 +64,9 @@ jobs:
           org.opencontainers.image.description=Akri Sample App
         tags: |
           type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=raw,value=${{steps.version-string.outputs.version}},enable=${{github.event_name != 'release'}}
+          type=semver,pattern=v{{version}}
+          type=semver,pattern=v{{major}}.{{minor}}
+          type=raw,value=v${{steps.version-string.outputs.version}}-dev,enable=${{github.event_name != 'release'}}
 
     - name: Build and push
       uses: docker/build-push-action@v5
diff --git a/.github/workflows/build-rust-containers.yml b/.github/workflows/build-rust-containers.yml
index d5559af6a..93c3b49d4 100644
--- a/.github/workflows/build-rust-containers.yml
+++ b/.github/workflows/build-rust-containers.yml
@@ -76,9 +76,9 @@ jobs:
           org.opencontainers.image.title=akri-${{matrix.component.label}}
         tags: |
           type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=raw,value=${{steps.version-string.outputs.version}},enable=${{github.event_name != 'release'}}
+          type=semver,pattern=v{{version}}
+          type=semver,pattern=v{{major}}.{{minor}}
+          type=raw,value=v${{steps.version-string.outputs.version}}-dev,enable=${{github.event_name != 'release'}}
 
     - name: Build and push
       uses: docker/build-push-action@v5
@@ -126,6 +126,7 @@ jobs:
       id: version-string
       run: |
         echo "version=$(cat version.txt)" >> $GITHUB_OUTPUT
+        echo "component_tag=$(echo "${{ matrix.component.label }}" | sed 's/-handler$//')" >> $GITHUB_OUTPUT
 
     - name: Cache Docker layers
       uses: actions/cache/restore@v3
@@ -151,14 +152,14 @@ jobs:
       uses: docker/metadata-action@v5
       id: meta
       with:
-        images: ghcr.io/project-akri/akri/${{ matrix.component.label }}
+        images: ghcr.io/project-akri/akri/${{steps.version-string.outputs.component_tag}}
         labels: |
           org.opencontainers.image.title=akri-${{matrix.component.label}}
         tags: |
           type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=raw,value=${{steps.version-string.outputs.version}},enable=${{github.event_name != 'release'}}
+          type=semver,pattern=v{{version}}
+          type=semver,pattern=v{{major}}.{{minor}}
+          type=raw,value=v${{steps.version-string.outputs.version}}-dev,enable=${{github.event_name != 'release'}}
 
     - name: Build and push
       uses: docker/build-push-action@v5
diff --git a/Cargo.lock b/Cargo.lock
index d10fc167e..f36e3fe1a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -298,7 +298,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "agent"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-debug-echo",
  "akri-discovery-utils",
@@ -358,7 +358,7 @@ dependencies = [
 
 [[package]]
 name = "akri-debug-echo"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-discovery-utils",
  "akri-shared",
@@ -376,7 +376,7 @@ dependencies = [
 
 [[package]]
 name = "akri-discovery-utils"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-shared",
  "anyhow",
@@ -398,7 +398,7 @@ dependencies = [
 
 [[package]]
 name = "akri-onvif"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-discovery-utils",
  "anyhow",
@@ -427,7 +427,7 @@ dependencies = [
 
 [[package]]
 name = "akri-opcua"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-discovery-utils",
  "anyhow",
@@ -446,7 +446,7 @@ dependencies = [
 
 [[package]]
 name = "akri-shared"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -471,7 +471,7 @@ dependencies = [
 
 [[package]]
 name = "akri-udev"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-discovery-utils",
  "anyhow",
@@ -986,7 +986,7 @@ checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
 
 [[package]]
 name = "controller"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-shared",
  "anyhow",
@@ -1178,7 +1178,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 [[package]]
 name = "debug-echo-discovery-handler"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-debug-echo",
  "akri-discovery-utils",
@@ -2479,7 +2479,7 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
 [[package]]
 name = "onvif-discovery-handler"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-discovery-utils",
  "akri-onvif",
@@ -2529,7 +2529,7 @@ dependencies = [
 
 [[package]]
 name = "opcua-discovery-handler"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-discovery-utils",
  "akri-opcua",
@@ -4134,7 +4134,7 @@ dependencies = [
 
 [[package]]
 name = "udev-discovery-handler"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-discovery-utils",
  "akri-udev",
@@ -4145,7 +4145,7 @@ dependencies = [
 
 [[package]]
 name = "udev-video-broker"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "akri-shared",
  "env_logger",
@@ -4422,7 +4422,7 @@ dependencies = [
 
 [[package]]
 name = "webhook-configuration"
-version = "0.12.17"
+version = "0.12.18"
 dependencies = [
  "actix-rt 2.7.0",
  "actix-web",
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index 308cc0d5b..c3984a2fe 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
diff --git a/build/samples.mk b/build/samples.mk
index ee98add4a..b6729d337 100644
--- a/build/samples.mk
+++ b/build/samples.mk
@@ -14,7 +14,7 @@ onvif-video-broker: onvif-video-broker-multiarch
 
 onvif-video-broker-multiarch: onvif-video-broker-amd64 onvif-video-broker-arm64 onvif-video-broker-arm32
 ifeq (1, $(PUSH))
-	docker buildx imagetool create --tag "$(PREFIX)/onvif-video-broker:$(LABEL_PREFIX)" 
+	docker buildx imagetools create --tag "$(PREFIX)/onvif-video-broker:$(LABEL_PREFIX)"
 endif
 
 ONVIF_BUILDX_PUSH_OUTPUT = type=image,name=$(PREFIX)/onvif-video-broker,push-by-digest=true,name-canonical=true,push=true
diff --git a/controller/Cargo.toml b/controller/Cargo.toml
index 3ad91db61..c969b2df7 100644
--- a/controller/Cargo.toml
+++ b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["<bfjelds@microsoft.com>", "<kagold@microsoft.com>"]
 edition = "2018"
diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
index 5f4204f87..fb4221c10 100644
--- a/deployment/helm/Chart.yaml
+++ b/deployment/helm/Chart.yaml
@@ -16,9 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.17
+version: 0.12.18
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.12.17
+appVersion: 0.12.18
diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
index b3088c828..e94096c2d 100644
--- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
+++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
index d762bf39f..769243373 100644
--- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
+++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
index 810d95338..ad68f4b06 100644
--- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
+++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml
index ee87916dc..5ca2abcee 100644
--- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml
+++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml
index ab7ba3fd1..f90d06825 100644
--- a/discovery-handlers/debug-echo/Cargo.toml
+++ b/discovery-handlers/debug-echo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml
index 638925806..acc5718e1 100644
--- a/discovery-handlers/onvif/Cargo.toml
+++ b/discovery-handlers/onvif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
index 1d834683e..4fc941886 100644
--- a/discovery-handlers/opcua/Cargo.toml
+++ b/discovery-handlers/opcua/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml
index c1accad86..186e915e8 100644
--- a/discovery-handlers/udev/Cargo.toml
+++ b/discovery-handlers/udev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
index 2813719ae..d64a9ccb9 100644
--- a/discovery-utils/Cargo.toml
+++ b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml
index 3b46aeb4f..e143031f7 100644
--- a/samples/brokers/udev-video-broker/Cargo.toml
+++ b/samples/brokers/udev-video-broker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index bbc459155..099dcd283 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
diff --git a/version.txt b/version.txt
index e392c3dc0..d1b3a7ea1 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.12.17
+0.12.18
diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml
index 3f5385a65..2b0f2fc65 100644
--- a/webhooks/validating/configuration/Cargo.toml
+++ b/webhooks/validating/configuration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["DazWilkin <daz.wilkin@gmail.com>"]
 edition = "2018"