diff --git a/images/calicoctl-utility/Dockerfile.alpine b/images/calicoctl-utility/Dockerfile.alpine
deleted file mode 100644
index 5f52703d..00000000
--- a/images/calicoctl-utility/Dockerfile.alpine
+++ /dev/null
@@ -1,40 +0,0 @@
-ARG DOCKER_REGISTRY=quay.io
-ARG CALICOCTL_IMAGE_PREFIX=calico/ctl
-ARG CALICOCTL_VERSION=v3.4.4
-
-ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
-
-FROM ${CALICOCTL_IMAGE}
-
-LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
-      org.opencontainers.image.url='https://airshipit.org' \
-      org.opencontainers.image.documentation='https://opendev.org/airship/porthole' \
-      org.opencontainers.image.source='https://opendev.org/airship/porthole' \
-      org.opencontainers.image.vendor='The Airship Authors' \
-      org.opencontainers.image.licenses='Apache-2.0'
-
-RUN export DEBIAN_FRONTEND=noninteractive \
-    && apk add dpkg --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
-    && apk add --update dpkg \
-    && sed -i '/nobody/d' /etc/passwd \
-    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && touch /var/lib/dpkg/status \
-    && apk update \
-    && apk add --update \
-       python3 python3-dev py3-pip build-base \
-       sudo screen \
-       wget curl socat \
-    && pip3 install oslo.rootwrap
-
-RUN PYTHON_LOCATION=$(pip3 show oslo.rootwrap|grep Location|awk '{print $2}') \
-    && sed -i "/rootwrap_logger.setLevel/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
-    && sed -i "/handler.setFormatter/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
-    && sed -i "/os.path.basename/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
-    && sed -i "/rootwrap_logger.addHandler/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py
-
-RUN mv /calicoctl /usr/local/bin/calicoctl \
-    && chmod 0754 /usr/local/bin/calicoctl \
-    && chmod 0754 /usr/bin/socat
-
-WORKDIR /tmp
-ENTRYPOINT ["/bin/sh", "-c"]
diff --git a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.alpine b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.alpine
deleted file mode 100644
index 76fa88a4..00000000
--- a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.alpine
+++ /dev/null
@@ -1,55 +0,0 @@
-ARG DOCKER_REGISTRY=quay.io
-ARG CALICOQ_IMAGE_PREFIX=tigera/calicoq
-ARG CALICOQ_VERSION=v2.5.1
-
-ARG CALICOQ_IMAGE="${DOCKER_REGISTRY}/${CALICOQ_IMAGE_PREFIX}:${CALICOQ_VERSION}"
-
-ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl
-ARG CALICOCTL_VERSION=v2.5.1
-
-ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
-
-FROM ${CALICOQ_IMAGE} AS stage_calicoq
-
-FROM ${CALICOCTL_IMAGE}
-
-ARG CALICOQ_VERSION=v2.5.1
-ARG CALICOCTL_VERSION=v2.5.1
-
-LABEL org.opencontainers.image.authors='Openstack-Helm Authors' \
-    org.opencontainers.image.url='https://opendev.org/airship/porthole/src/branch/master/Dockerfiles/calicoctl-utility' \
-    org.opencontainers.image.documentation='https://opendev.org/airship/porthole/src/branch/master/Dockerfiles/calicoctl-utility/README' \
-    org.opencontainers.image.source='https://opendev.org/airship/porthole/src/branch/master/Dockerfiles/calicoctl-utility' \
-    org.opencontainers.image.vendor='Openstack-Helm Authors' \
-    org.opencontainers.image.licenses='BSD-3-Clause' \
-    io.tigera.calicoctl.version="${CALICOCTL_VERSION}" \
-    io.tigera.calicoq.version="${CALICOQ_VERSION}"
-
-RUN set -xe \
-    && export DEBIAN_FRONTEND=noninteractive \
-    && apk add dpkg --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
-    && apk add --update dpkg \
-    && touch /var/lib/dpkg/status \
-    && apk update \
-    && apk add --update \
-       python3 python3-dev py3-pip build-base \
-       sudo screen \
-       wget curl socat \
-    && pip3 install oslo.rootwrap
-
-RUN PYTHON_LOCATION=$(pip3 show oslo.rootwrap|grep Location|awk '{print $2}') \
-    && sed -i "/rootwrap_logger.setLevel/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
-    && sed -i "/handler.setFormatter/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
-    && sed -i "/os.path.basename/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
-    && sed -i "/rootwrap_logger.addHandler/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py
-
-COPY --from=stage_calicoq /calicoq /usr/local/bin/calicoq
-
-RUN mv /calicoctl /usr/local/bin/calicoctl \
-    && chmod 0754 /usr/local/bin/calicoctl \
-    && chmod 0754 /usr/local/bin/calicoq \
-    && chmod 0754 /usr/bin/socat
-
-
-WORKDIR /tmp
-ENTRYPOINT ["/bin/sh", "-c"]
diff --git a/images/calicoctl-utility/Makefile b/images/calicoctl-utility/Makefile
index 1d3d0e5d..428c7494 100644
--- a/images/calicoctl-utility/Makefile
+++ b/images/calicoctl-utility/Makefile
@@ -17,7 +17,7 @@ IMAGE_NAME      ?= calico-utility
 IMAGE_PREFIX    ?= airship/porthole
 IMAGE_TAG       ?= latest
 BUILD_TYPE      ?= community
-OS_RELEASE      ?= alpine
+OS_RELEASE      ?= ubuntu_bionic
 
 IMAGE := $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)