diff --git a/.github/workflows/kbs-build-and-push.yaml b/.github/workflows/kbs-build-and-push.yaml
index af2ababc04..8eaf30bd7a 100644
--- a/.github/workflows/kbs-build-and-push.yaml
+++ b/.github/workflows/kbs-build-and-push.yaml
@@ -18,15 +18,20 @@ jobs:
         tag:
           - kbs
           - kbs-grpc-as
+          - kbs-ita-as
         include:
           - tag: kbs
             docker_file: kbs/docker/Dockerfile
             https_crypto: openssl
             name: build-in AS
           - tag: kbs-grpc-as
-            docker_file: kbs/docker/Dockerfile.coco-as-grpc
+            docker_file: kbs/docker/coco-as-grpc/Dockerfile
             https_crypto: rustls
             name: gRPC AS
+          - tag: kbs-ita-as
+            docker_file: kbs/docker/intel-trust-authority/Dockerfile
+            https_crypto: rustls
+            name: Intel Trust Authority AS
     runs-on: ${{ matrix.instance }}
 
     steps:
@@ -78,6 +83,7 @@ jobs:
         image:
           - kbs
           - kbs-grpc-as
+          - kbs-ita-as
     permissions:
       packages: write
     runs-on: ubuntu-latest
diff --git a/hack/release-helper.sh b/hack/release-helper.sh
index 722fbac0a8..5f29302744 100755
--- a/hack/release-helper.sh
+++ b/hack/release-helper.sh
@@ -9,6 +9,7 @@ declare -g release_tag
 declare -A staged_to_release=(
     ["staged-images/kbs"]="key-broker-service"
     ["staged-images/kbs-grpc-as"]="key-broker-service"
+    ["staged-images/kbs-ita-as"]="key-broker-service"
     ["staged-images/rvps"]="reference-value-provider-service"
     ["staged-images/coco-as-grpc"]="attestation-service"
     ["staged-images/coco-as-restful"]="attestation-service"
diff --git a/kbs/docker/intel-trust-authority/Dockerfile b/kbs/docker/intel-trust-authority/Dockerfile
index 090b7a03cb..989f37bc13 100644
--- a/kbs/docker/intel-trust-authority/Dockerfile
+++ b/kbs/docker/intel-trust-authority/Dockerfile
@@ -1,4 +1,6 @@
 FROM rust:latest as builder
+ARG ARCH=x86_64
+ARG HTTPS_CRYPTO=rustls
 
 WORKDIR /usr/src/kbs
 COPY . .
@@ -6,8 +8,7 @@ COPY . .
 RUN apt-get update && apt install -y git
 
 # Build and Install KBS
-ARG KBS_FEATURES=intel-trust-authority-as,rustls,resource,opa
-RUN cargo install --path kbs/src/kbs --no-default-features --features ${KBS_FEATURES}
+RUN cargo install --path kbs/src/kbs --no-default-features --features intel-trust-authority-as,${HTTPS_CRYPTO},resource,opa
 
 FROM ubuntu:22.04