diff --git a/charts/calicoctl-utility/values.yaml b/charts/calicoctl-utility/values.yaml
index a24035d8..d46daf48 100644
--- a/charts/calicoctl-utility/values.yaml
+++ b/charts/calicoctl-utility/values.yaml
@@ -19,7 +19,7 @@
 
 images:
   tags:
-    calicoctl_utility: 'quay.io/airshipit/porthole-calicoctl-utility:latest-alpine'
+    calicoctl_utility: 'quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_xenial'
     image_repo_sync: docker.io/docker:18.09.02
   pull_policy: IfNotPresent
   local_registry:
@@ -58,10 +58,10 @@ release_group: null
 labels:
   utility:
     node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
+    node_selector_value: enabled
   job:
     node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
+    node_selector_value: enabled
 
 dependencies:
   dynamic:
diff --git a/images/calicoctl-utility/README.md b/images/calicoctl-utility/README.md
index b3d68f5c..6d16e332 100644
--- a/images/calicoctl-utility/README.md
+++ b/images/calicoctl-utility/README.md
@@ -1,5 +1,6 @@
 # Calicoctl-utility Container
 
+<<<<<<< HEAD
 This container shall allow access to calico pod running on every node.
 Support personnel should be able to get the appropriate data from this utility container
 by specifying the node and respective service command within the local cluster.
@@ -18,3 +19,24 @@ Example:
 1. Create docker image for calicoctl release v3.4.0
 
    make IMAGE_TAG=v3.4.0
+=======
+Utility container for Calicoctl shall enable Operations to trigger the command set for
+Network APIs together from within a single shell with a uniform command structure. The
+access to network-Calico shall be controlled through RBAC role assigned to the user.
+
+## Usage
+
+ Get in to the utility pod using kubectl exec.
+ To perform any operation use the below example.
+
+  - kubectl exec -it <POD_NAME> -n utility /bin/bash
+
+Example:
+
+1. utilscli calicoctl get nodes
+   NAME
+   bionic
+
+2. utilscli calicoctl version
+   Client Version:    v3.4.4
+   Git commit:        e3ecd927
diff --git a/tools/deployment/utilities/005-calicoctl-utility.sh b/tools/deployment/utilities/005-calicoctl-utility.sh
new file mode 100755
index 00000000..47b74848
--- /dev/null
+++ b/tools/deployment/utilities/005-calicoctl-utility.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -xe
+
+kubectl label nodes --all openstack-helm-node-class=enabled --overwrite
+#NOTE: Lint and package chart
+
+cd charts
+
+helm  upgrade --install calicoctl-utility ./calicoctl-utility --namespace=utility
+
+#NOTE: Validate Deployment info
+kubectl get -n utility secrets
+kubectl get -n utility configmaps
+kubectl get pods -n utility
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 382c1179..afc734ad 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -17,7 +17,6 @@
       jobs:
         - airship-porthole-linter
         - airship-porthole-images-build-gate-calicoctl-utility
-        - airship-porthole-images-build-gate-calicoctl-utility-ubuntu_xenial
         - airship-porthole-images-build-gate-ceph-utility
         - airship-porthole-images-build-gate-compute-utility
         - airship-porthole-images-build-gate-etcdctl-utility
@@ -28,7 +27,6 @@
       jobs:
         - airship-porthole-linter
         - airship-porthole-images-build-gate-calicoctl-utility
-        - airship-porthole-images-build-gate-calicoctl-utility-ubuntu_xenial
         - airship-porthole-images-build-gate-ceph-utility
         - airship-porthole-images-build-gate-compute-utility
         - airship-porthole-images-build-gate-etcdctl-utility
@@ -39,7 +37,6 @@
     post:
       jobs:
         - airship-porthole-images-publish-calicoctl-utility
-        - airship-porthole-images-publish-calicoctl-utility-ubuntu_xenial
         - airship-porthole-images-publish-ceph-utility
         - airship-porthole-images-publish-compute-utility
         - airship-porthole-images-publish-etcdctl-utility
diff --git a/zuul.d/calicoctl-utility.yaml b/zuul.d/calicoctl-utility.yaml
index 9a5d6fe7..db91d9d6 100644
--- a/zuul.d/calicoctl-utility.yaml
+++ b/zuul.d/calicoctl-utility.yaml
@@ -17,22 +17,14 @@
     parent: &parent airship-porthole-images
     vars:
       image_name: &image_name porthole-calicoctl-utility
-      distro_suffix: &distro_suffix alpine
-    files: &files
+      distro_suffix: &distro_suffix ubuntu_xenial
+    files:
       - ^charts/calicoctl-utility/.*$
       - ^images/calicoctl-utility/.*$
       - ^Makefile$
       - ^tools/.*$
       - ^zuul.d/.*$
 
-- job:
-    name: airship-porthole-images-build-gate-calicoctl-utility-ubuntu_xenial
-    parent: *parent
-    vars:
-      image_name: *image_name
-      distro_suffix: ubuntu_xenial
-    files: *files
-
 - job:
     name: airship-porthole-images-publish-calicoctl-utility
     parent: *parent
@@ -47,18 +39,3 @@
       tags:
         dynamic:
           commit: true
-
-- job:
-    name: airship-porthole-images-publish-calicoctl-utility-ubuntu_xenial
-    parent: *parent
-    secrets:
-      - name: quay_credentials
-        secret: quay_credentials
-        pass-to-parent: true
-    vars:
-      image_name: *image_name
-      distro_suffix: ubuntu_xenial
-      publish: true
-      tags:
-        dynamic:
-          commit: true