Teck-Lab · CaptainPowerTurtle · Jun 19, 2026 · Jun 18, 2026 · Jun 18, 2026 · Jun 18, 2026
diff --git a/.github/workflows/canary-release.yaml b/.github/workflows/canary-release.yaml
@@ -33,12 +33,23 @@ jobs:
           for api_dir in src/services/*/*.Api; do
             if [ -f "$api_dir/Containerfile" ]; then
               SERVICE_NAME=$(echo "$api_dir" | sed -n 's|src/services/\([^/]*\)/.*|\1|p' | tr '[:upper:]' '[:lower:]')
+              # Normalize service name to deployment naming convention
+              case "$SERVICE_NAME" in
+                image-generator|billing) : ;;
+                *-api) : ;;
+                *) SERVICE_NAME="${SERVICE_NAME}-api" ;;
+              esac
               PACKAGES="${PACKAGES:+$PACKAGES,}teck-cloud/${SERVICE_NAME}"
             fi
           done
           for gateway_dir in src/gateways/*; do
             if [ -f "$gateway_dir/Containerfile" ]; then
               SERVICE_NAME=$(basename "$gateway_dir" | tr '[:upper:]' '[:lower:]' | sed 's/\./-/g')
+              # Normalize gateway name to deployment naming convention
+              case "$SERVICE_NAME" in
+                web-admin-gateway) SERVICE_NAME="admin-gateway" ;;
+                web-public-gateway) SERVICE_NAME="yarp-gateway" ;;
+              esac
               PACKAGES="${PACKAGES:+$PACKAGES,}teck-cloud/${SERVICE_NAME}"
             fi
           done
@@ -132,6 +143,12 @@ jobs:
               for api_dir in src/services/*/*.Api; do
                 if [ -f "$api_dir/Containerfile" ]; then
                   SERVICE_NAME=$(echo "$api_dir" | sed -n 's|src/services/\([^/]*\)/.*|\1|p')
+                  # Normalize service name to deployment naming convention
+                  case "$SERVICE_NAME" in
+                    image-generator|billing) : ;;
+                    *-api) : ;;
+                    *) SERVICE_NAME="${SERVICE_NAME}-api" ;;
+                  esac
                   if [ -n "$SERVICE_NAME" ]; then
                     jq -cn \
                       --arg service_name "$SERVICE_NAME" \
@@ -144,6 +161,11 @@ jobs:
               for gateway_dir in src/gateways/*; do
                 if [ -f "$gateway_dir/Containerfile" ]; then
                   SERVICE_NAME=$(basename "$gateway_dir" | tr '[:upper:]' '[:lower:]' | sed 's/\./-/g')
+                  # Normalize gateway name to deployment naming convention
+                  case "$SERVICE_NAME" in
+                    web-admin-gateway) SERVICE_NAME="admin-gateway" ;;
+                    web-public-gateway) SERVICE_NAME="yarp-gateway" ;;
+                  esac
                   jq -cn \
                     --arg service_name "$SERVICE_NAME" \
                     --arg dockerfile_path "$gateway_dir/Containerfile" \

diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
@@ -31,6 +31,12 @@ jobs:
               for api_dir in src/services/*/*.Api; do
                 if [ -f "$api_dir/Containerfile" ]; then
                   SERVICE_NAME=$(echo "$api_dir" | sed -n 's|src/services/\([^/]*\)/.*|\1|p')
+                  # Normalize service name to deployment naming convention
+                  case "$SERVICE_NAME" in
+                    image-generator|billing) : ;;
+                    *-api) : ;;
+                    *) SERVICE_NAME="${SERVICE_NAME}-api" ;;
+                  esac
                   if [ -n "$SERVICE_NAME" ]; then
                     jq -cn \
                       --arg service_name "$SERVICE_NAME" \
@@ -43,6 +49,11 @@ jobs:
               for gateway_dir in src/gateways/*; do
                 if [ -f "$gateway_dir/Containerfile" ]; then
                   SERVICE_NAME=$(basename "$gateway_dir" | tr '[:upper:]' '[:lower:]' | sed 's/\./-/g')
+                  # Normalize gateway name to deployment naming convention
+                  case "$SERVICE_NAME" in
+                    web-admin-gateway) SERVICE_NAME="admin-gateway" ;;
+                    web-public-gateway) SERVICE_NAME="yarp-gateway" ;;
+                  esac
                   jq -cn \
                     --arg service_name "$SERVICE_NAME" \
                     --arg dockerfile_path "$gateway_dir/Containerfile" \

diff --git a/.github/workflows/dotnet-test-check.yaml b/.github/workflows/dotnet-test-check.yaml
@@ -326,7 +326,7 @@ jobs:
         run: dotnet workload install aspire
 
       - name: Restore dependencies
-        run: dotnet restore --locked-mode
+        run: dotnet restore --force-evaluate
 
       - name: Download affected.proj
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -362,7 +362,7 @@ jobs:
         with:
           reviewdog_version: v0.21.0
       - name: Restore dependencies
-        run: dotnet restore --locked-mode
+        run: dotnet restore --force-evaluate
       - name: Run dotnet format and annotate
         env:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
@@ -607,6 +607,10 @@ jobs:
           NORMALIZED_DOCKERFILE_PATH=$(echo "$DOCKERFILE_PATH" | sed -E 's|^\./||')
           SERVICE_NAME=$(basename "$(dirname "$DOCKERFILE_PATH")" | tr '[:upper:]' '[:lower:]' | sed 's/\./-/g')
           SERVICE_NAME=$(echo "$SERVICE_NAME" | sed -E 's/-linux-(amd64|arm64)$//')
+          case "$SERVICE_NAME" in
+            web-admin-gateway) SERVICE_NAME="admin-gateway" ;;
+            web-public-gateway) SERVICE_NAME="yarp-gateway" ;;
+          esac
           SERVICE_PROJECT=$(echo "$NORMALIZED_DOCKERFILE_PATH" | awk -F/ '{for(i=1;i<=NF;i++){if($i=="services" && (i+1)<=NF){print $(i+1); exit}}}')
           if [ -z "$SERVICE_PROJECT" ]; then
             SERVICE_PROJECT="$SERVICE_NAME"

diff --git a/.github/workflows/release-services.yaml b/.github/workflows/release-services.yaml
@@ -159,6 +159,12 @@ jobs:
               for api_dir in src/services/*/*.Api; do
                 if [ -f "$api_dir/Containerfile" ]; then
                   SERVICE_NAME=$(echo "$api_dir" | sed -n 's|src/services/\([^/]*\)/.*|\1|p')
+                  # Normalize service name to deployment naming convention
+                  case "$SERVICE_NAME" in
+                    image-generator|billing) : ;;
+                    *-api) : ;;
+                    *) SERVICE_NAME="${SERVICE_NAME}-api" ;;
+                  esac
                   if [ -n "$SERVICE_NAME" ]; then
                     jq -cn \
                       --arg service_name "$SERVICE_NAME" \
@@ -171,6 +177,11 @@ jobs:
               for gateway_dir in src/gateways/*; do
                 if [ -f "$gateway_dir/Containerfile" ]; then
                   SERVICE_NAME=$(basename "$gateway_dir" | tr '[:upper:]' '[:lower:]' | sed 's/\./-/g')
+                  # Normalize gateway name to deployment naming convention
+                  case "$SERVICE_NAME" in
+                    web-admin-gateway) SERVICE_NAME="admin-gateway" ;;
+                    web-public-gateway) SERVICE_NAME="yarp-gateway" ;;
+                  esac
                   jq -cn \
                     --arg service_name "$SERVICE_NAME" \
                     --arg dockerfile_path "$gateway_dir/Containerfile" \

diff --git a/.github/workflows/reusable-build-sign-sbom.yml b/.github/workflows/reusable-build-sign-sbom.yml
@@ -68,45 +68,45 @@ jobs:
           ref: ${{ inputs.source-ref != '' && inputs.source-ref || format('refs/tags/v{0}', inputs.version) }}
 
       - name: Setup .NET SDK
-        if: (inputs.service-name == 'catalog' || inputs.service-name == 'customer') && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: (inputs.service-name == 'catalog-api' || inputs.service-name == 'customer-api') && !startsWith(inputs.dockerfile-path, 'src/auth/')
         uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
           global-json-file: global.json
 
       - name: Restore Catalog.Api
-        if: inputs.service-name == 'catalog' && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: inputs.service-name == 'catalog-api' && !startsWith(inputs.dockerfile-path, 'src/auth/')
         run: dotnet restore src/services/catalog/Catalog.Api/Catalog.Api.csproj -r linux-x64
 
       - name: Restore Customer.Api
-        if: inputs.service-name == 'customer' && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: inputs.service-name == 'customer-api' && !startsWith(inputs.dockerfile-path, 'src/auth/')
         run: dotnet restore src/services/customer/Customer.Api/Customer.Api.csproj -r linux-x64
 
       - name: Build Catalog.Api for code generation
-        if: inputs.service-name == 'catalog' && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: inputs.service-name == 'catalog-api' && !startsWith(inputs.dockerfile-path, 'src/auth/')
         run: dotnet build src/services/catalog/Catalog.Api/Catalog.Api.csproj -c Release -r linux-x64 --no-restore
 
       - name: Build Customer.Api for code generation
-        if: inputs.service-name == 'customer' && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: inputs.service-name == 'customer-api' && !startsWith(inputs.dockerfile-path, 'src/auth/')
         run: dotnet build src/services/customer/Customer.Api/Customer.Api.csproj -c Release -r linux-x64 --no-restore
 
       - name: Generate Wolverine code for Catalog.Api
-        if: inputs.service-name == 'catalog' && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: inputs.service-name == 'catalog-api' && !startsWith(inputs.dockerfile-path, 'src/auth/')
         working-directory: src/services/catalog/Catalog.Api
         env:
           ASPNETCORE_ENVIRONMENT: Development
           Logging__LogLevel__Grpc: Warning
         run: dotnet ./bin/Release/net10.0/linux-x64/Catalog.Api.dll codegen write
 
       - name: Generate Wolverine code for Customer.Api
-        if: inputs.service-name == 'customer' && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: inputs.service-name == 'customer-api' && !startsWith(inputs.dockerfile-path, 'src/auth/')
         working-directory: src/services/customer/Customer.Api
         env:
           ASPNETCORE_ENVIRONMENT: Development
           Logging__LogLevel__Grpc: Warning
         run: dotnet ./bin/Release/net10.0/linux-x64/Customer.Api.dll codegen write
 
       - name: Upload Catalog Wolverine code
-        if: inputs.service-name == 'catalog' && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: inputs.service-name == 'catalog-api' && !startsWith(inputs.dockerfile-path, 'src/auth/')
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: wolverine-generated-catalog
@@ -115,7 +115,7 @@ jobs:
           retention-days: 1
 
       - name: Upload Customer Wolverine code
-        if: inputs.service-name == 'customer' && !startsWith(inputs.dockerfile-path, 'src/auth/')
+        if: inputs.service-name == 'customer-api' && !startsWith(inputs.dockerfile-path, 'src/auth/')
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: wolverine-generated-customer
@@ -151,14 +151,14 @@ jobs:
           ref: ${{ inputs.source-ref != '' && inputs.source-ref || format('refs/tags/v{0}', inputs.version) }}
 
       - name: Download Catalog Wolverine code
-        if: inputs.service-name == 'catalog'
+        if: inputs.service-name == 'catalog-api'
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: wolverine-generated-catalog
           path: src/services/catalog/Catalog.Api/Internal/Generated
 
       - name: Download Customer Wolverine code
-        if: inputs.service-name == 'customer'
+        if: inputs.service-name == 'customer-api'
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: wolverine-generated-customer

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -16,6 +16,7 @@
     <PackageVersion Include="Mediator.Abstractions" Version="3.0.2" />
     <PackageVersion Include="Mediator.SourceGenerator" Version="3.0.2" />
     <PackageVersion Include="WolverineFx.MemoryPack" Version="6.2.2" />
+    <PackageVersion Include="MessagePack" Version="3.1.7" />
     <PackageVersion Include="MemoryPack" Version="1.21.4" />
     <PackageVersion Include="WolverineFx.RabbitMQ" Version="6.2.2" />
     <PackageVersion Include="WolverineFx.SignalR" Version="6.2.2" />

diff --git a/deployment/admin-gateway/overlays/development/deployment.yaml b/deployment/admin-gateway/overlays/development/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: admin-gateway
-          image: ghcr.io/teck-lab/teck-cloud/web-admin-gateway:development
+          image: ghcr.io/teck-lab/teck-cloud/admin-gateway:development
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/admin-gateway/overlays/development/kustomization.yaml b/deployment/admin-gateway/overlays/development/kustomization.yaml
@@ -8,5 +8,5 @@ resources:
   - httproute.yaml
 
 images:
-  - name: ghcr.io/teck-lab/teck-cloud/web-admin-gateway
+  - name: ghcr.io/teck-lab/teck-cloud/admin-gateway
     newTag: development
diff --git a/deployment/admin-gateway/overlays/preview/deployment.yaml b/deployment/admin-gateway/overlays/preview/deployment.yaml
@@ -21,7 +21,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: admin-gateway
-          image: ghcr.io/teck-lab/teck-cloud/web-admin-gateway:preview
+          image: ghcr.io/teck-lab/teck-cloud/admin-gateway:preview
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/admin-gateway/overlays/production/deployment.yaml b/deployment/admin-gateway/overlays/production/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: admin-gateway
-          image: ghcr.io/teck-lab/teck-cloud/web-admin-gateway:production
+          image: ghcr.io/teck-lab/teck-cloud/admin-gateway:production
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/admin-gateway/overlays/production/kustomization.yaml b/deployment/admin-gateway/overlays/production/kustomization.yaml
@@ -5,8 +5,7 @@ resources:
   - configmap.yaml
   - deployment.yaml
   - service.yaml
-  - httproute.yaml
 
 images:
-  - name: ghcr.io/teck-lab/teck-cloud/web-admin-gateway
+  - name: ghcr.io/teck-lab/teck-cloud/admin-gateway
     newTag: production
diff --git a/deployment/basket-api/overlays/development/deployment.yaml b/deployment/basket-api/overlays/development/deployment.yaml
@@ -23,7 +23,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: basket-api
-          image: ghcr.io/teck-lab/teck-cloud/basket:development
+          image: ghcr.io/teck-lab/teck-cloud/basket-api:development
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/basket-api/overlays/development/kustomization.yaml b/deployment/basket-api/overlays/development/kustomization.yaml
@@ -7,5 +7,5 @@ resources:
   - service.yaml
 
 images:
-  - name: ghcr.io/teck-lab/teck-cloud/basket
+  - name: ghcr.io/teck-lab/teck-cloud/basket-api
     newTag: development
diff --git a/deployment/basket-api/overlays/preview/deployment.yaml b/deployment/basket-api/overlays/preview/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: basket-api
-          image: ghcr.io/teck-lab/teck-cloud-basket-api:preview
+          image: ghcr.io/teck-lab/teck-cloud/basket-api:preview
           imagePullPolicy: Always
           envFrom:
             - configMapRef:

diff --git a/deployment/basket-api/overlays/production/deployment.yaml b/deployment/basket-api/overlays/production/deployment.yaml
@@ -23,7 +23,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: basket-api
-          image: ghcr.io/teck-lab/teck-cloud/basket:production
+          image: ghcr.io/teck-lab/teck-cloud/basket-api:production
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/basket-api/overlays/production/kustomization.yaml b/deployment/basket-api/overlays/production/kustomization.yaml
@@ -7,5 +7,5 @@ resources:
   - service.yaml
 
 images:
-  - name: ghcr.io/teck-lab/teck-cloud/basket
+  - name: ghcr.io/teck-lab/teck-cloud/basket-api
     newTag: production
diff --git a/deployment/catalog-api/overlays/development/deployment.yaml b/deployment/catalog-api/overlays/development/deployment.yaml
@@ -23,7 +23,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: catalog-api
-          image: ghcr.io/teck-lab/teck-cloud/catalog:development
+          image: ghcr.io/teck-lab/teck-cloud/catalog-api:development
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/catalog-api/overlays/development/kustomization.yaml b/deployment/catalog-api/overlays/development/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 images:
   - name: ghcr.io/teck-lab/teck-cloud-migrations
     newTag: development
-  - name: ghcr.io/teck-lab/teck-cloud/catalog
+  - name: ghcr.io/teck-lab/teck-cloud/catalog-api
     newTag: development
diff --git a/deployment/catalog-api/overlays/preview/deployment.yaml b/deployment/catalog-api/overlays/preview/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: catalog-api
-          image: ghcr.io/teck-lab/teck-cloud-catalog-api:preview
+          image: ghcr.io/teck-lab/teck-cloud/catalog-api:preview
           imagePullPolicy: Always
           envFrom:
             - configMapRef:

diff --git a/deployment/catalog-api/overlays/production/deployment.yaml b/deployment/catalog-api/overlays/production/deployment.yaml
@@ -23,7 +23,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: catalog-api
-          image: ghcr.io/teck-lab/teck-cloud/catalog:production
+          image: ghcr.io/teck-lab/teck-cloud/catalog-api:production
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/catalog-api/overlays/production/kustomization.yaml b/deployment/catalog-api/overlays/production/kustomization.yaml
@@ -7,5 +7,5 @@ resources:
   - service.yaml
 
 images:
-  - name: ghcr.io/teck-lab/teck-cloud/catalog
+  - name: ghcr.io/teck-lab/teck-cloud/catalog-api
     newTag: production
diff --git a/deployment/customer-api/overlays/development/deployment.yaml b/deployment/customer-api/overlays/development/deployment.yaml
@@ -23,7 +23,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: customer-api
-          image: ghcr.io/teck-lab/teck-cloud/customer:development
+          image: ghcr.io/teck-lab/teck-cloud/customer-api:development
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/customer-api/overlays/development/kustomization.yaml b/deployment/customer-api/overlays/development/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
 images:
   - name: ghcr.io/teck-lab/teck-cloud-migrations
     newTag: development
-  - name: ghcr.io/teck-lab/teck-cloud/customer
+  - name: ghcr.io/teck-lab/teck-cloud/customer-api
     newTag: development
diff --git a/deployment/customer-api/overlays/preview/deployment.yaml b/deployment/customer-api/overlays/preview/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: customer-api
-          image: ghcr.io/teck-lab/teck-cloud-customer-api:preview
+          image: ghcr.io/teck-lab/teck-cloud/customer-api:preview
           imagePullPolicy: Always
           envFrom:
             - configMapRef:

diff --git a/deployment/customer-api/overlays/production/deployment.yaml b/deployment/customer-api/overlays/production/deployment.yaml
@@ -23,7 +23,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: customer-api
-          image: ghcr.io/teck-lab/teck-cloud/customer:production
+          image: ghcr.io/teck-lab/teck-cloud/customer-api:production
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/customer-api/overlays/production/kustomization.yaml b/deployment/customer-api/overlays/production/kustomization.yaml
@@ -7,5 +7,5 @@ resources:
   - service.yaml
 
 images:
-  - name: ghcr.io/teck-lab/teck-cloud/customer
+  - name: ghcr.io/teck-lab/teck-cloud/customer-api
     newTag: production
diff --git a/deployment/device-api/overlays/development/deployment.yaml b/deployment/device-api/overlays/development/deployment.yaml
@@ -23,7 +23,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: device-api
-          image: ghcr.io/teck-lab/teck-cloud/device:development
+          image: ghcr.io/teck-lab/teck-cloud/device-api:development
           imagePullPolicy: Always
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/deployment/device-api/overlays/development/kustomization.yaml b/deployment/device-api/overlays/development/kustomization.yaml
@@ -7,5 +7,5 @@ resources:
   - service.yaml
 
 images:
-  - name: ghcr.io/teck-lab/teck-cloud/device
+  - name: ghcr.io/teck-lab/teck-cloud/device-api
     newTag: development